octave: libgui/src/qt-interpreter-events.cc comparison

comparison libgui/src/qt-interpreter-events.cc @ 31648:29d734430e5f stable

maint: Re-indent code after switch to using namespace macros. * BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.cc, qt-graphics-toolkit.h, module.mk, QTerminal.h, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, graphics-init.cc, graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc, gui-utils.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc, led-indicator.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h, release-notes.cc, release-notes.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Re-indent code after switch to using namespace macros.

author	John W. Eaton <jwe@octave.org>
date	Tue, 06 Dec 2022 14:53:00 -0500
parents	c6d54dd31a7e
children	deb553ac2c54 597f3ee61a48

comparison

equal deleted inserted replaced

-:c6d54dd31a7e
+:29d734430e5f
 Q_DECLARE_METATYPE (octave::fcn_callback)
 Q_DECLARE_METATYPE (octave::meth_callback)
 OCTAVE_BEGIN_NAMESPACE(octave)
 static QStringList
 make_qstring_list (const std::list<std::string>& lst)
 {
 QStringList retval;
 for (const auto& s : lst)
 retval.append (QString::fromStdString (s));
 return retval;
 }
 static QStringList
 make_filter_list (const event_manager::filter_list& lst)
 {
 QStringList retval;
 // We have pairs of data, first being the list of extensions
 // exta;exb;extc etc second the name to use as filter name
 // (optional).  Qt wants a list of filters in the format of
 // 'FilterName (space separated exts)'.
 for (const auto& ext_name : lst)
 {
 QString ext = QString::fromStdString (ext_name.first);
 QString name = QString::fromStdString (ext_name.second);
 // Strip out extensions from name and replace ';' with spaces in list.
 name.replace (QRegExp (R"(\(.*\))"), "");
 ext.replace (";", " ");
 if (name.isEmpty ())
 {
 // No name field.  Build one from the extensions.
 name = ext.toUpper () + " Files";
 }
 retval.append (name + " (" + ext + ')');
 }
 return retval;
 }
 qt_interpreter_events::qt_interpreter_events (base_qobject& oct_qobj)
 : interpreter_events (), m_octave_qobj (oct_qobj),
 m_uiwidget_creator (oct_qobj), m_result (), m_mutex (),
 m_waitcondition ()
 {
 qRegisterMetaType<QIntList> ("QIntList");
 qRegisterMetaType<QFloatList> ("QFloatList");
 qRegisterMetaType<octave_value> ("octave_value");
 qRegisterMetaType<symbol_info_list> ("symbol_info_list");
 qRegisterMetaType<fcn_callback> ("fcn_callback");
 qRegisterMetaType<meth_callback> ("meth_callback");
 connect (this, &qt_interpreter_events::confirm_shutdown_signal,
 this, &qt_interpreter_events::confirm_shutdown_octave);
 connect (this, &qt_interpreter_events::get_named_icon_signal,
 this, &qt_interpreter_events::get_named_icon_slot);
 connect (this, &qt_interpreter_events::gui_preference_signal,
 this, &qt_interpreter_events::gui_preference_slot);
 }
 void qt_interpreter_events::start_gui (bool gui_app)
 {
 if (m_octave_qobj.experimental_terminal_widget ())
 emit start_gui_signal (gui_app);
 }
 void qt_interpreter_events::close_gui (void)
 {
 if (m_octave_qobj.experimental_terminal_widget ())
 emit close_gui_signal ();
 }
 std::list<std::string>
 qt_interpreter_events::file_dialog (const filter_list& filter,
 const std::string& title,
 const std::string& filename,
 const std::string& dirname,
 const std::string& multimode)
 {
 QStringList lst
 = m_uiwidget_creator.file_dialog (make_filter_list (filter),
 QString::fromStdString (title),
 QString::fromStdString (filename),
 QString::fromStdString (dirname),
 QString::fromStdString (multimode));
 std::list<std::string> retval;
 for (const auto& s : lst)
 retval.push_back (s.toStdString ());
 return retval;
 }
 std::list<std::string>
 qt_interpreter_events::input_dialog (const std::list<std::string>& prompt,
 const std::string& title,
 const std::list<float>& nr,
 const std::list<float>& nc,
 const std::list<std::string>& defaults)
 {
 QStringList lst
 = m_uiwidget_creator.input_dialog (make_qstring_list (prompt),
+QString::fromStdString (title),
+std_list_to_qt_list<float> (nr),
+std_list_to_qt_list<float> (nc),
+make_qstring_list (defaults));
+std::list<std::string> retval;
+for (const auto& s : lst)
+retval.push_back (s.toStdString ());
+return retval;
+}
+std::pair<std::list<int>, int>
+qt_interpreter_events::list_dialog (const std::list<std::string>& list,
+const std::string& mode,
+int width, int height,
+const std::list<int>& initial,
+const std::string& name,
+const std::list<std::string>& prompt,
+const std::string& ok_string,
+const std::string& cancel_string)
+{
+QPair<QIntList, int> result
+= m_uiwidget_creator.list_dialog (make_qstring_list (list),
+QString::fromStdString (mode),
+width, height,
+std_list_to_qt_list<int> (initial),
+QString::fromStdString (name),
+make_qstring_list (prompt),
+QString::fromStdString (ok_string),
+QString::fromStdString (cancel_string));
+QIntList& lst = result.first;
+return std::pair<std::list<int>, int> (std::list<int> (lst.begin (),
+lst.end ()),
+result.second);
+}
+std::string
+qt_interpreter_events::question_dialog (const std::string& msg,
+const std::string& title,
+const std::string& btn1,
+const std::string& btn2,
+const std::string& btn3,
+const std::string& btndef)
+{
+QString icon = "quest";
+QStringList buttons;
+QStringList role;
+// Must use ResetRole which is left-aligned for all OS and WM.
+role << "ResetRole" << "ResetRole" << "ResetRole";
+buttons << QString::fromStdString (btn1);
+if (btn2 == "")
+role.removeAt (0);
+else
+buttons << QString::fromStdString (btn2);
+buttons << QString::fromStdString (btn3);
+QString answer
+= m_uiwidget_creator.message_dialog (QString::fromStdString (msg),
 QString::fromStdString (title),
-std_list_to_qt_list<float> (nr),
+icon, buttons,
-std_list_to_qt_list<float> (nc),
+QString::fromStdString (btndef),
-make_qstring_list (defaults));
+role);
-std::list<std::string> retval;
+return answer.toStdString ();
-for (const auto& s : lst)
+}
-retval.push_back (s.toStdString ());
+void qt_interpreter_events::update_path_dialog (void)
-return retval;
+{
-}
+emit update_path_dialog_signal ();
+}
-std::pair<std::list<int>, int>
-qt_interpreter_events::list_dialog (const std::list<std::string>& list,
+void qt_interpreter_events::show_preferences (void)
-const std::string& mode,
+{
-int width, int height,
+emit show_preferences_signal ();
-const std::list<int>& initial,
+}
-const std::string& name,
-const std::list<std::string>& prompt,
+void qt_interpreter_events::apply_preferences (void)
-const std::string& ok_string,
+{
-const std::string& cancel_string)
+emit apply_new_settings ();
-{
+}
-QPair<QIntList, int> result
-= m_uiwidget_creator.list_dialog (make_qstring_list (list),
+void qt_interpreter_events::show_terminal_window (void)
-QString::fromStdString (mode),
+{
-width, height,
+emit show_terminal_window_signal ();
-std_list_to_qt_list<int> (initial),
+}
-QString::fromStdString (name),
-make_qstring_list (prompt),
+bool qt_interpreter_events::show_documentation (const std::string& file)
-QString::fromStdString (ok_string),
+{
-QString::fromStdString (cancel_string));
+emit show_documentation_signal (QString::fromStdString (file));
-QIntList& lst = result.first;
+return true;
-return std::pair<std::list<int>, int> (std::list<int> (lst.begin (),
+}
-lst.end ()),
-result.second);
+void qt_interpreter_events::show_file_browser (void)
-}
+{
+emit show_file_browser_signal ();
-std::string
+}
-qt_interpreter_events::question_dialog (const std::string& msg,
-const std::string& title,
+void qt_interpreter_events::show_command_history (void)
-const std::string& btn1,
+{
-const std::string& btn2,
+emit show_command_history_signal ();
-const std::string& btn3,
+}
-const std::string& btndef)
-{
+void qt_interpreter_events::show_workspace (void)
-QString icon = "quest";
+{
-QStringList buttons;
+emit show_workspace_signal ();
-QStringList role;
+}
-// Must use ResetRole which is left-aligned for all OS and WM.
+void qt_interpreter_events::show_community_news (int serial)
-role << "ResetRole" << "ResetRole" << "ResetRole";
+{
+emit show_community_news_signal (serial);
-buttons << QString::fromStdString (btn1);
+}
-if (btn2 == "")
-role.removeAt (0);
+void qt_interpreter_events::show_release_notes (void)
-else
+{
-buttons << QString::fromStdString (btn2);
+emit show_release_notes_signal ();
-buttons << QString::fromStdString (btn3);
+}
-QString answer
+bool qt_interpreter_events::edit_file (const std::string& file)
-= m_uiwidget_creator.message_dialog (QString::fromStdString (msg),
+{
-QString::fromStdString (title),
+emit edit_file_signal (QString::fromStdString (file));
-icon, buttons,
-QString::fromStdString (btndef),
+return true;
-role);
+}
-return answer.toStdString ();
+void qt_interpreter_events::edit_variable (const std::string& expr,
-}
+const octave_value& val)
+{
-void qt_interpreter_events::update_path_dialog (void)
+emit edit_variable_signal (QString::fromStdString (expr), val);
-{
+}
-emit update_path_dialog_signal ();
-}
+bool qt_interpreter_events::confirm_shutdown (void)
+{
-void qt_interpreter_events::show_preferences (void)
+QMutexLocker autolock (&m_mutex);
-{
-emit show_preferences_signal ();
+emit confirm_shutdown_signal ();
-}
+// Wait for result.
-void qt_interpreter_events::apply_preferences (void)
+wait ();
-{
-emit apply_new_settings ();
+return m_result.toBool ();
 }
-void qt_interpreter_events::show_terminal_window (void)
+bool qt_interpreter_events::prompt_new_edit_file (const std::string& file)
 {
-emit show_terminal_window_signal ();
+resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-}
+gui_settings *settings = rmgr.get_settings ();
-bool qt_interpreter_events::show_documentation (const std::string& file)
+if (! settings || settings->value (ed_create_new_file).toBool ())
-{
-emit show_documentation_signal (QString::fromStdString (file));
 return true;
-}
+std::string abs_fname = sys::env::make_absolute (file);
-void qt_interpreter_events::show_file_browser (void)
-{
+QStringList btn;
-emit show_file_browser_signal ();
+QStringList role;
-}
+role << "YesRole" << "RejectRole";
+btn << tr ("Create") << tr ("Cancel");
-void qt_interpreter_events::show_command_history (void)
-{
+QString answer = m_uiwidget_creator.message_dialog
-emit show_command_history_signal ();
+(tr ("File\n%1\ndoes not exist. Do you want to create it?").
-}
+arg (QString::fromStdString (abs_fname)),
+tr ("Octave Editor"), "quest", btn, tr ("Create"), role);
-void qt_interpreter_events::show_workspace (void)
-{
+return (answer == tr ("Create"));
-emit show_workspace_signal ();
+}
-}
+// Prompt to allow file to be run by setting cwd (or if
-void qt_interpreter_events::show_community_news (int serial)
+// addpath_option==true, alternatively setting the path).
-{
-emit show_community_news_signal (serial);
+int
-}
+qt_interpreter_events::debug_cd_or_addpath_error (const std::string& file,
+const std::string& dir,
-void qt_interpreter_events::show_release_notes (void)
+bool addpath_option)
 {
-emit show_release_notes_signal ();
+int retval = -1;
-}
+QString qdir = QString::fromStdString (dir);
-bool qt_interpreter_events::edit_file (const std::string& file)
+QString qfile = QString::fromStdString (file);
-{
+QString msg
-emit edit_file_signal (QString::fromStdString (file));
+= (addpath_option
+? tr ("The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir)
-return true;
+: tr ("The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir));
-}
+QString title = tr ("Change Directory or Add Directory to Load Path");
-void qt_interpreter_events::edit_variable (const std::string& expr,
-const octave_value& val)
+QString cd_txt = tr ("&Change Directory");
-{
+QString addpath_txt = tr ("&Add Directory to Load Path");
-emit edit_variable_signal (QString::fromStdString (expr), val);
+QString cancel_txt = tr ("Cancel");
-}
+QStringList btn;
-bool qt_interpreter_events::confirm_shutdown (void)
+QStringList role;
-{
+btn << cd_txt;
-QMutexLocker autolock (&m_mutex);
+role << "YesRole";
+if (addpath_option)
-emit confirm_shutdown_signal ();
+{
+btn << addpath_txt;
-// Wait for result.
+role << "AcceptRole";
-wait ();
+}
+btn << cancel_txt;
-return m_result.toBool ();
+role << "RejectRole";
-}
+QString result
-bool qt_interpreter_events::prompt_new_edit_file (const std::string& file)
+= m_uiwidget_creator.message_dialog (msg, title, "quest", btn,
-{
+cancel_txt, role);
-resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-gui_settings *settings = rmgr.get_settings ();
+if (result == cd_txt)
+retval = 1;
-if (! settings || settings->value (ed_create_new_file).toBool ())
+else if (result == addpath_txt)
-return true;
+retval = 2;
-std::string abs_fname = sys::env::make_absolute (file);
+return retval;
+}
-QStringList btn;
-QStringList role;
+uint8NDArray qt_interpreter_events::get_named_icon (const std::string& name)
-role << "YesRole" << "RejectRole";
+{
-btn << tr ("Create") << tr ("Cancel");
+QMutexLocker autolock (&m_mutex);
-QString answer = m_uiwidget_creator.message_dialog
+emit get_named_icon_signal (QString::fromStdString (name));
-(tr ("File\n%1\ndoes not exist. Do you want to create it?").
-arg (QString::fromStdString (abs_fname)),
+// Wait for result.
-tr ("Octave Editor"), "quest", btn, tr ("Create"), role);
+wait ();
-return (answer == tr ("Create"));
+uint8NDArray empty_img;
-}
+QIcon icon = m_result.value<QIcon> ();
-// Prompt to allow file to be run by setting cwd (or if
-// addpath_option==true, alternatively setting the path).
+if (icon.isNull ())
+return empty_img;
-int
-qt_interpreter_events::debug_cd_or_addpath_error (const std::string& file,
+QImage img = icon.pixmap (QSize (32, 32)).toImage ();
-const std::string& dir,
-bool addpath_option)
+if (img.format () != QImage::Format_ARGB32_Premultiplied)
-{
+return empty_img;
-int retval = -1;
+dim_vector dims (img.height (), img.width (), 4);
-QString qdir = QString::fromStdString (dir);
-QString qfile = QString::fromStdString (file);
+uint8NDArray retval (dims, 0);
-QString msg
-= (addpath_option
+uint8_t *bits = img.bits ();
-? tr ("The file %1 does not exist in the load path.  To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir)
-: tr ("The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir));
+for (int i = 0; i < img.height (); i++)
+{
-QString title = tr ("Change Directory or Add Directory to Load Path");
+for (int j = 0; j < img.width (); j++)
+{
-QString cd_txt = tr ("&Change Directory");
+retval(i, j, 2) = bits[0];
-QString addpath_txt = tr ("&Add Directory to Load Path");
+retval(i, j, 1) = bits[1];
-QString cancel_txt = tr ("Cancel");
+retval(i, j, 0) = bits[2];
+retval(i, j, 3) = bits[3];
-QStringList btn;
-QStringList role;
+bits += 4;
-btn << cd_txt;
+}
-role << "YesRole";
+}
-if (addpath_option)
-{
+return retval;
-btn << addpath_txt;
+}
-role << "AcceptRole";
-}
+void qt_interpreter_events::get_named_icon_slot (const QString& name)
-btn << cancel_txt;
+{
-role << "RejectRole";
+QMutexLocker autolock (&m_mutex);
-QString result
+resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-= m_uiwidget_creator.message_dialog (msg, title, "quest", btn,
+m_result = QVariant::fromValue (rmgr.icon (name));
-cancel_txt, role);
+wake_all ();
-if (result == cd_txt)
+}
-retval = 1;
-else if (result == addpath_txt)
+std::string
-retval = 2;
+qt_interpreter_events::gui_preference (const std::string& key,
+const std::string& value)
-return retval;
+{
-}
+QString pref_value;
-uint8NDArray qt_interpreter_events::get_named_icon (const std::string& name)
+QMutexLocker autolock (&m_mutex);
-{
-QMutexLocker autolock (&m_mutex);
+// Emit the signal for changing or getting a preference
+emit gui_preference_signal (QString::fromStdString (key),
-emit get_named_icon_signal (QString::fromStdString (name));
+QString::fromStdString (value));
-// Wait for result.
+// Wait for response (pref_value).
 wait ();
-uint8NDArray empty_img;
+QString pref = m_result.toString ();
-QIcon icon = m_result.value<QIcon> ();
+return pref.toStdString ();
+}
-if (icon.isNull ())
-return empty_img;
+bool qt_interpreter_events::copy_image_to_clipboard (const std::string& file)
+{
-QImage img = icon.pixmap (QSize (32, 32)).toImage ();
+emit copy_image_to_clipboard_signal (QString::fromStdString (file), true);
-if (img.format () != QImage::Format_ARGB32_Premultiplied)
+return true;
-return empty_img;
+}
-dim_vector dims (img.height (), img.width (), 4);
+void qt_interpreter_events::focus_window (const std::string win_name)
+{
-uint8NDArray retval (dims, 0);
+emit focus_window_signal (QString::fromStdString (win_name));
+}
-uint8_t *bits = img.bits ();
+void qt_interpreter_events::execute_command_in_terminal
-for (int i = 0; i < img.height (); i++)
+(const std::string& command)
 {
-for (int j = 0; j < img.width (); j++)
+emit execute_command_in_terminal_signal (QString::fromStdString (command));
-{
+}
-retval(i, j, 2) = bits[0];
-retval(i, j, 1) = bits[1];
+void qt_interpreter_events::register_documentation (const std::string& file)
-retval(i, j, 0) = bits[2];
+{
-retval(i, j, 3) = bits[3];
+emit register_documentation_signal (QString::fromStdString (file));
+}
-bits += 4;
-}
+void qt_interpreter_events::unregister_documentation (const std::string& file)
-}
+{
+emit unregister_documentation_signal (QString::fromStdString (file));
-return retval;
+}
-}
+void qt_interpreter_events::interpreter_output (const std::string& msg)
-void qt_interpreter_events::get_named_icon_slot (const QString& name)
+{
-{
+if (m_octave_qobj.experimental_terminal_widget ()
-QMutexLocker autolock (&m_mutex);
+&& m_octave_qobj.have_terminal_window ())
+emit interpreter_output_signal (QString::fromStdString (msg));
-resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+else
-m_result = QVariant::fromValue (rmgr.icon (name));
+{
+// FIXME: is this the correct thing to do?
-wake_all ();
+std::cout << msg;
 }
+}
-std::string
-qt_interpreter_events::gui_preference (const std::string& key,
+void qt_interpreter_events::display_exception (const execution_exception& ee,
-const std::string& value)
+bool beep)
 {
-QString pref_value;
+if (m_octave_qobj.experimental_terminal_widget ()
+&& m_octave_qobj.have_terminal_window ())
-QMutexLocker autolock (&m_mutex);
+{
+// Output the exception message
-// Emit the signal for changing or getting a preference
+std::ostringstream buf;
-emit gui_preference_signal (QString::fromStdString (key),
+ee.display (buf);
-QString::fromStdString (value));
+emit interpreter_output_signal (QString::fromStdString (buf.str ()));
+// Create w new command line
-// Wait for response (pref_value).
+emit new_command_line_signal ();
-wait ();
+}
+else
-QString pref = m_result.toString ();
+{
+if (beep)
-return pref.toStdString ();
+std::cerr << "\a";
-}
+ee.display (std::cerr);
-bool qt_interpreter_events::copy_image_to_clipboard (const std::string& file)
+}
-{
+}
-emit copy_image_to_clipboard_signal (QString::fromStdString (file), true);
+void qt_interpreter_events::gui_status_update (const std::string& feature,
-return true;
+const std::string& status)
-}
+{
+emit gui_status_update_signal (QString::fromStdString (feature),
-void qt_interpreter_events::focus_window (const std::string win_name)
+QString::fromStdString (status));
-{
+}
-emit focus_window_signal (QString::fromStdString (win_name));
-}
+void qt_interpreter_events::update_gui_lexer (void)
+{
-void qt_interpreter_events::execute_command_in_terminal
+emit update_gui_lexer_signal (true);
-(const std::string& command)
+}
-{
-emit execute_command_in_terminal_signal (QString::fromStdString (command));
+void qt_interpreter_events::directory_changed (const std::string& dir)
-}
+{
+emit directory_changed_signal (QString::fromStdString (dir));
-void qt_interpreter_events::register_documentation (const std::string& file)
+}
-{
-emit register_documentation_signal (QString::fromStdString (file));
+void qt_interpreter_events::file_remove (const std::string& old_name,
-}
+const std::string& new_name)
+{
-void qt_interpreter_events::unregister_documentation (const std::string& file)
+QMutexLocker autolock (&m_mutex);
-{
-emit unregister_documentation_signal (QString::fromStdString (file));
+// Emit the signal for the editor for closing the file if it is open
-}
+emit file_remove_signal (QString::fromStdString (old_name),
+QString::fromStdString (new_name));
-void qt_interpreter_events::interpreter_output (const std::string& msg)
-{
+// Wait for file removal to complete before continuing.
-if (m_octave_qobj.experimental_terminal_widget ()
+wait ();
-&& m_octave_qobj.have_terminal_window ())
+}
-emit interpreter_output_signal (QString::fromStdString (msg));
-else
+void qt_interpreter_events::file_renamed (bool load_new)
 {
-// FIXME: is this the correct thing to do?
+emit file_renamed_signal (load_new);
-std::cout << msg;
+}
-}
-}
+void qt_interpreter_events::set_workspace (bool top_level, bool debug,
+const symbol_info_list& syminfo,
-void qt_interpreter_events::display_exception (const execution_exception& ee,
+bool update_variable_editor)
-bool beep)
+{
-{
+if (! top_level && ! debug)
-if (m_octave_qobj.experimental_terminal_widget ()
+return;
-&& m_octave_qobj.have_terminal_window ())
-{
+emit set_workspace_signal (top_level, debug, syminfo);
-// Output the exception message
-std::ostringstream buf;
+if (update_variable_editor)
-ee.display (buf);
+emit refresh_variable_editor_signal ();
-emit interpreter_output_signal (QString::fromStdString (buf.str ()));
+}
-// Create w new command line
-emit new_command_line_signal ();
+void qt_interpreter_events::clear_workspace (void)
-}
+{
-else
+emit clear_workspace_signal ();
-{
+}
-if (beep)
-std::cerr << "\a";
+void qt_interpreter_events::update_prompt (const std::string& prompt)
+{
-ee.display (std::cerr);
+emit update_prompt_signal (QString::fromStdString (prompt));
 }
-}
+void qt_interpreter_events::set_history (const string_vector& hist)
-void qt_interpreter_events::gui_status_update (const std::string& feature,
+{
-const std::string& status)
+QStringList qt_hist;
-{
-emit gui_status_update_signal (QString::fromStdString (feature),
+for (octave_idx_type i = 0; i < hist.numel (); i++)
-QString::fromStdString (status));
+qt_hist.append (QString::fromStdString (hist[i]));
-}
+emit set_history_signal (qt_hist);
-void qt_interpreter_events::update_gui_lexer (void)
+}
-{
-emit update_gui_lexer_signal (true);
+void qt_interpreter_events::append_history (const std::string& hist_entry)
-}
+{
+emit append_history_signal (QString::fromStdString (hist_entry));
-void qt_interpreter_events::directory_changed (const std::string& dir)
+}
-{
-emit directory_changed_signal (QString::fromStdString (dir));
+void qt_interpreter_events::clear_history (void)
-}
+{
+emit clear_history_signal ();
-void qt_interpreter_events::file_remove (const std::string& old_name,
+}
-const std::string& new_name)
-{
+void qt_interpreter_events::pre_input_event (void)
-QMutexLocker autolock (&m_mutex);
+{ }
-// Emit the signal for the editor for closing the file if it is open
+void qt_interpreter_events::post_input_event (void)
-emit file_remove_signal (QString::fromStdString (old_name),
+{ }
-QString::fromStdString (new_name));
+void qt_interpreter_events::enter_debugger_event (const std::string& /*fcn_name*/,
-// Wait for file removal to complete before continuing.
+const std::string& fcn_file_name,
-wait ();
-}
-void qt_interpreter_events::file_renamed (bool load_new)
-{
-emit file_renamed_signal (load_new);
-}
-void qt_interpreter_events::set_workspace (bool top_level, bool debug,
-const symbol_info_list& syminfo,
-bool update_variable_editor)
-{
-if (! top_level && ! debug)
-return;
-emit set_workspace_signal (top_level, debug, syminfo);
-if (update_variable_editor)
-emit refresh_variable_editor_signal ();
-}
-void qt_interpreter_events::clear_workspace (void)
-{
-emit clear_workspace_signal ();
-}
-void qt_interpreter_events::update_prompt (const std::string& prompt)
-{
-emit update_prompt_signal (QString::fromStdString (prompt));
-}
-void qt_interpreter_events::set_history (const string_vector& hist)
-{
-QStringList qt_hist;
-for (octave_idx_type i = 0; i < hist.numel (); i++)
-qt_hist.append (QString::fromStdString (hist[i]));
-emit set_history_signal (qt_hist);
-}
-void qt_interpreter_events::append_history (const std::string& hist_entry)
-{
-emit append_history_signal (QString::fromStdString (hist_entry));
-}
-void qt_interpreter_events::clear_history (void)
-{
-emit clear_history_signal ();
-}
-void qt_interpreter_events::pre_input_event (void)
-{ }
-void qt_interpreter_events::post_input_event (void)
-{ }
-void qt_interpreter_events::enter_debugger_event (const std::string& /*fcn_name*/,
-const std::string& fcn_file_name,
-int line)
-{
-if (fcn_file_name.empty ())
-return;
-insert_debugger_pointer (fcn_file_name, line);
-emit enter_debugger_signal ();
-}
-void
-qt_interpreter_events::execute_in_debugger_event (const std::string& file,
-int line)
-{
-delete_debugger_pointer (file, line);
-}
-void qt_interpreter_events::exit_debugger_event (void)
-{
-emit exit_debugger_signal ();
-}
-// Display (if @insert true) or remove the appropriate symbol for a breakpoint
-// in @file at @line with condition @cond.
-void qt_interpreter_events::update_breakpoint (bool insert,
-const std::string& file,
-int line,
-const std::string& cond)
-{
-emit update_breakpoint_marker_signal (insert, QString::fromStdString (file),
-line, QString::fromStdString (cond));
-}
-void
-qt_interpreter_events::insert_debugger_pointer (const std::string& file,
 int line)
 {
-emit insert_debugger_pointer_signal (QString::fromStdString (file), line);
+if (fcn_file_name.empty ())
-}
+return;
-void
+insert_debugger_pointer (fcn_file_name, line);
-qt_interpreter_events::delete_debugger_pointer (const std::string& file,
+emit enter_debugger_signal ();
+}
+void
+qt_interpreter_events::execute_in_debugger_event (const std::string& file,
 int line)
 {
-emit delete_debugger_pointer_signal (QString::fromStdString (file), line);
+delete_debugger_pointer (file, line);
 }
-void
+void qt_interpreter_events::exit_debugger_event (void)
-qt_interpreter_events::confirm_shutdown_octave (void)
+{
-{
+emit exit_debugger_signal ();
-QMutexLocker autolock (&m_mutex);
+}
-m_result = m_octave_qobj.confirm_shutdown ();
+// Display (if @insert true) or remove the appropriate symbol for a breakpoint
+// in @file at @line with condition @cond.
-wake_all ();
+void qt_interpreter_events::update_breakpoint (bool insert,
-}
+const std::string& file,
+int line,
-// If VALUE is empty, return current value of preference named by KEY.
+const std::string& cond)
-//
+{
-// If VALUE is not empty, set preference named by KEY to VALUE return
+emit update_breakpoint_marker_signal (insert, QString::fromStdString (file),
-// previous value.
+line, QString::fromStdString (cond));
-//
+}
-// FIXME: should we have separate get and set functions?  With only
-// one, we don't allow a preference value to be set to the empty
+void
-// string.
+qt_interpreter_events::insert_debugger_pointer (const std::string& file,
+int line)
-void
+{
-qt_interpreter_events::gui_preference_slot (const QString& key,
+emit insert_debugger_pointer_signal (QString::fromStdString (file), line);
+}
+void
+qt_interpreter_events::delete_debugger_pointer (const std::string& file,
+int line)
+{
+emit delete_debugger_pointer_signal (QString::fromStdString (file), line);
+}
+void
+qt_interpreter_events::confirm_shutdown_octave (void)
+{
+QMutexLocker autolock (&m_mutex);
+m_result = m_octave_qobj.confirm_shutdown ();
+wake_all ();
+}
+// If VALUE is empty, return current value of preference named by KEY.
+//
+// If VALUE is not empty, set preference named by KEY to VALUE return
+// previous value.
+//
+// FIXME: should we have separate get and set functions?  With only
+// one, we don't allow a preference value to be set to the empty
+// string.
+void
+qt_interpreter_events::gui_preference_slot (const QString& key,
+const QString& value)
+{
+QMutexLocker autolock (&m_mutex);
+resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+gui_settings *settings = rmgr.get_settings ();
+QString read_value = settings->value (key).toString ();
+// Some preferences need extra handling
+QString adjusted_value = gui_preference_adjust (key, value);
+if (! adjusted_value.isEmpty () && (read_value != adjusted_value))
+{
+// Change settings only for new, non-empty values
+settings->setValue (key, QVariant (adjusted_value));
+emit settings_changed (settings, true);   // true: changed by worker
+}
+m_result = read_value;
+wake_all ();
+}
+QString
+qt_interpreter_events::gui_preference_adjust (const QString& key,
 const QString& value)
 {
-QMutexLocker autolock (&m_mutex);
+// Immediately return if no new value is given.
-resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+if (value.isEmpty ())
-gui_settings *settings = rmgr.get_settings ();
+return value;
-QString read_value = settings->value (key).toString ();
+QString adjusted_value = value;
-// Some preferences need extra handling
+// Not all encodings are available.  Encodings are uppercase and do
-QString adjusted_value = gui_preference_adjust (key, value);
+// not use CPxxx but IBMxxx or WINDOWS-xxx.
-if (! adjusted_value.isEmpty () && (read_value != adjusted_value))
+if (key == ed_default_enc.key)
 {
-// Change settings only for new, non-empty values
+adjusted_value = adjusted_value.toUpper ();
-settings->setValue (key, QVariant (adjusted_value));
+QStringList codecs;
-emit settings_changed (settings, true);   // true: changed by worker
+resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-}
+rmgr.get_codecs (&codecs);
-m_result = read_value;
+QRegExp re ("^CP(\\d+)$");
-wake_all ();
+if (adjusted_value == "SYSTEM")
-}
+adjusted_value =
+QString ("SYSTEM (") +
-QString
+QString (octave_locale_charset_wrapper ()).toUpper () +
-qt_interpreter_events::gui_preference_adjust (const QString& key,
+QString (")");
-const QString& value)
+else if (re.indexIn (adjusted_value) > -1)
 {
-// Immediately return if no new value is given.
+if (codecs.contains ("IBM" + re.cap (1)))
+adjusted_value = "IBM" + re.cap (1);
-if (value.isEmpty ())
+else if (codecs.contains ("WINDOWS-" + re.cap (1)))
-return value;
+adjusted_value = "WINDOWS-" + re.cap (1);
+else
-QString adjusted_value = value;
+adjusted_value.clear ();
+}
-// Not all encodings are available.  Encodings are uppercase and do
+else if (! codecs.contains (adjusted_value))
-// not use CPxxx but IBMxxx or WINDOWS-xxx.
+adjusted_value.clear ();
+}
-if (key == ed_default_enc.key)
-{
+return adjusted_value;
-adjusted_value = adjusted_value.toUpper ();
+}
-QStringList codecs;
-resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-rmgr.get_codecs (&codecs);
-QRegExp re ("^CP(\\d+)$");
-if (adjusted_value == "SYSTEM")
-adjusted_value =
-QString ("SYSTEM (") +
-QString (octave_locale_charset_wrapper ()).toUpper () +
-QString (")");
-else if (re.indexIn (adjusted_value) > -1)
-{
-if (codecs.contains ("IBM" + re.cap (1)))
-adjusted_value = "IBM" + re.cap (1);
-else if (codecs.contains ("WINDOWS-" + re.cap (1)))
-adjusted_value = "WINDOWS-" + re.cap (1);
-else
-adjusted_value.clear ();
-}
-else if (! codecs.contains (adjusted_value))
-adjusted_value.clear ();
-}
-return adjusted_value;
-}
 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

comparison libgui/src/qt-interpreter-events.cc @ 31648:29d734430e5f stable