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

annotate libgui/src/qt-interpreter-events.cc @ 27552:de5129cb0796

refactor dialog functions * dialog.h, dialog.cc (QUIWidgetCreator::message_dialog): Rename from signal_dialog and combine with part of qt_interpreter_events question_dialog function. Use QMutexLocker object to manage lock. Return result directly. Change all uses. (QUIWidgetCreator::list_dialog): Rename from signal_listview and combine with part of qt_interpreter_events list_dialog function. Use QMutexLocker object to manage lock. Return result directly. Change all uses. (QUIWidgetCreator::input_dialog): Rename from signal_input_layout and combine with part of qt_interpreter events input_dialog function. Use QMutexLocker object to manage lock. Return result directly. Change all uses. (QUIWidgetCreator::file_dialog): Rename from signal_filedialog and combine with part of qt_interpreter events file_dialog function. Use QMutexLocker object to manage lock. Return result directly. Change all uses. (QUIWidgetCreator::dialog_button_clicked, (QUIWidgetCreator::list_select_finished, QUIWidgetCreator::input_finished): Don't lock/unlock mutex here. * qt-interpreter-events.cc (qt_interpreter_events::file_dialog, qt_interpreter_events::input_dialog, qt_interpreter_events::list_dialog, qt_interpreter_events::question_dialog): Simplify.

author	John W. Eaton <jwe@octave.org>
date	Thu, 24 Oct 2019 03:40:52 -0400
parents	564bba235594
children	9b72eb111b7e

rev	line source
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26117 diff changeset	3 Copyright (C) 2013-2019 John W. Eaton
00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26117 diff changeset	4 Copyright (C) 2011-2019 Jacob Dawid
00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26117 diff changeset	5 Copyright (C) 2011-2019 John P. Swensen
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	6
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	7 This file is part of Octave.
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	8
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24301 diff changeset	9 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	10 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24301 diff changeset	11 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	12 (at your option) any later version.
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	13
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	14 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	15 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22417 diff changeset	17 GNU General Public License for more details.
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	18
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	19 You should have received a copy of the GNU General Public License
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	20 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24301 diff changeset	21 <https://www.gnu.org/licenses/>.
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	22
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	23 */
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	24
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21717 diff changeset	25 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	26 # include "config.h"
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	27 #endif
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	28
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	29 #include <QDialog>
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	30 #include <QDir>
24641 7d177be54c37 pass variable value to variable editor in addition to variable name John W. Eaton <jwe@octave.org> parents: 24632 diff changeset	31 #include <QMetaType>
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	32 #include <QPushButton>
24641 7d177be54c37 pass variable value to variable editor in addition to variable name John W. Eaton <jwe@octave.org> parents: 24632 diff changeset	33 #include <QStringList>
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	34
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	35 #include "dialog.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	36 #include "qt-interpreter-events.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	37 #include "resource-manager.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	38
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	39 #include "oct-env.h"
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	40 #include "str-vec.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	41
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	42 #include "builtin-defun-decls.h"
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	43 #include "error.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	44 #include "interpreter-private.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	45 #include "load-path.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	46 #include "oct-map.h"
25557 bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	47 #include "octave.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	48 #include "ov.h"
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25948 diff changeset	49 #include "syminfo.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	50 #include "utils.h"
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	51
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24641 diff changeset	52 Q_DECLARE_METATYPE (octave_value)
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25948 diff changeset	53 Q_DECLARE_METATYPE (octave::symbol_info_list)
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27284 diff changeset	54 Q_DECLARE_METATYPE (octave::fcn_callback)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27284 diff changeset	55 Q_DECLARE_METATYPE (octave::meth_callback)
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	56
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	57 namespace octave
24641 7d177be54c37 pass variable value to variable editor in addition to variable name John W. Eaton <jwe@octave.org> parents: 24632 diff changeset	58 {
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	59 static QStringList
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	60 make_qstring_list (const std::list<std::string>& lst)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	61 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	62 QStringList retval;
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	63
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	64 for (const auto& s : lst)
b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	65 retval.append (QString::fromStdString (s));
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	66
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	67 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	68 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	69
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	70 static QStringList
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	71 make_filter_list (const event_manager::filter_list& lst)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	72 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	73 QStringList retval;
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	74
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	75 // We have pairs of data, first being the list of extensions
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	76 // exta;exb;extc etc second the name to use as filter name
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	77 // (optional). Qt wants a list of filters in the format of
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	78 // 'FilterName (space separated exts)'.
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	79
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	80 for (const auto& ext_name : lst)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	81 {
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	82 QString ext = QString::fromStdString (ext_name.first);
b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	83 QString name = QString::fromStdString (ext_name.second);
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	84
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	85 // Strip out extensions from name and replace ';' with spaces in
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	86 // list.
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	87
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	88 name.replace (QRegExp ("\\(.*\\)"), "");
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	89 ext.replace (";", " ");
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	90
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	91 if (name.isEmpty ())
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	92 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	93 // No name field. Build one from the extensions.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	94 name = ext.toUpper () + " Files";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	95 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	96
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	97 retval.append (name + " (" + ext + ')');
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	98 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	99
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	100 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	101 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	102
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	103 qt_interpreter_events::qt_interpreter_events (void)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	104 : interpreter_events (), m_shutdown_confirm_result (false)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	105 {
27551 564bba235594 move some dialog slot functions from octave-qobject.cc to dialog.cc John W. Eaton <jwe@octave.org> parents: 27550 diff changeset	106 qRegisterMetaType<QIntList> ("QIntList");
564bba235594 move some dialog slot functions from octave-qobject.cc to dialog.cc John W. Eaton <jwe@octave.org> parents: 27550 diff changeset	107 qRegisterMetaType<QFloatList> ("QFloatList");
564bba235594 move some dialog slot functions from octave-qobject.cc to dialog.cc John W. Eaton <jwe@octave.org> parents: 27550 diff changeset	108
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	109 qRegisterMetaType<octave_value> ("octave_value");
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	110 qRegisterMetaType<symbol_info_list> ("symbol_info_list");
20091 89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	111
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	112 qRegisterMetaType<fcn_callback> ("fcn_callback");
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	113 qRegisterMetaType<meth_callback> ("meth_callback");
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	114 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	115
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	116 std::list<std::string>
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	117 qt_interpreter_events::file_dialog (const filter_list& filter,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	118 const std::string& title,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	119 const std::string& filename,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	120 const std::string& dirname,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	121 const std::string& multimode)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	122 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	123 QStringList lst
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	124 = uiwidget_creator.file_dialog (make_filter_list (filter),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	125 QString::fromStdString (title),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	126 QString::fromStdString (filename),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	127 QString::fromStdString (dirname),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	128 QString::fromStdString (multimode));
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	129
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	130 std::list<std::string> retval;
20091 89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	131
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	132 for (const auto& s : lst)
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	133 retval.push_back (s.toStdString ());
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	134
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	135 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	136 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	137
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	138 std::list<std::string>
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	139 qt_interpreter_events::input_dialog (const std::list<std::string>& prompt,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	140 const std::string& title,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	141 const std::list<float>& nr,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	142 const std::list<float>& nc,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	143 const std::list<std::string>& defaults)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	144 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	145 QStringList lst
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	146 = uiwidget_creator.input_dialog (make_qstring_list (prompt),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	147 QString::fromStdString (title),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	148 QFloatList::fromStdList (nr),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	149 QFloatList::fromStdList (nc),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	150 make_qstring_list (defaults));
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	151 std::list<std::string> retval;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	152
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	153 for (const auto& s : lst)
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	154 retval.push_back (s.toStdString ());
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	155
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	156 return retval;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	157 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	158
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	159 std::pair<std::list<int>, int>
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	160 qt_interpreter_events::list_dialog (const std::list<std::string>& list,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	161 const std::string& mode,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	162 int width, int height,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	163 const std::list<int>& initial,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	164 const std::string& name,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	165 const std::list<std::string>& prompt,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	166 const std::string& ok_string,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	167 const std::string& cancel_string)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	168 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	169 QPair<QIntList, int> result
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	170 = uiwidget_creator.list_dialog (make_qstring_list (list),
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	171 QString::fromStdString (mode),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	172 width, height,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	173 QList<int>::fromStdList (initial),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	174 QString::fromStdString (name),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	175 make_qstring_list (prompt),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	176 QString::fromStdString (ok_string),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	177 QString::fromStdString (cancel_string));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	178
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	179 return std::pair<std::list<int>, int> (result.first.toStdList (),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	180 result.second);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	181 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	182
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	183 std::string
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	184 qt_interpreter_events::question_dialog (const std::string& msg,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	185 const std::string& title,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	186 const std::string& btn1,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	187 const std::string& btn2,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	188 const std::string& btn3,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	189 const std::string& btndef)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	190 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	191 QString icon = "quest";
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	192 QStringList buttons;
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	193 QStringList role;
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	194
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	195 // Must use ResetRole which is left-aligned for all OS and WM.
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	196 role << "ResetRole" << "ResetRole" << "ResetRole";
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	197
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	198 buttons << QString::fromStdString (btn1);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	199 if (btn2 == "")
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	200 role.removeAt (0);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	201 else
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	202 buttons << QString::fromStdString (btn2);
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	203 buttons << QString::fromStdString (btn3);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	204
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	205 QString answer
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	206 = uiwidget_creator.message_dialog (QString::fromStdString (msg),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	207 QString::fromStdString (title),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	208 icon, buttons,
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	209 QString::fromStdString (btndef),
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	210 role);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	211
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	212 return answer.toStdString ();
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	213 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	214
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	215 void qt_interpreter_events::update_path_dialog (void)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	216 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	217 emit update_path_dialog_signal ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	218 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	219
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	220 void qt_interpreter_events::show_preferences (void)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	221 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	222 emit show_preferences_signal ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	223 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	224
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	225 void qt_interpreter_events::show_doc (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	226 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	227 emit show_doc_signal (QString::fromStdString (file));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	228 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	229
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	230 bool qt_interpreter_events::edit_file (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	231 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	232 emit edit_file_signal (QString::fromStdString (file));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	233
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	234 return true;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	235 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	236
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	237 void qt_interpreter_events::edit_variable (const std::string& expr,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	238 const octave_value& val)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	239 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	240 emit edit_variable_signal (QString::fromStdString (expr), val);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	241 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	242
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	243 bool qt_interpreter_events::confirm_shutdown (void)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	244 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	245 // Lock the mutex before emitting signal.
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	246 lock ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	247
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	248 emit confirm_shutdown_signal ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	249
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	250 // Wait while the GUI shuts down.
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	251 wait ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	252
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	253 // The GUI has sent a signal and the thread has been awakened.
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	254
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	255 unlock ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	256
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	257 return m_shutdown_confirm_result;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	258 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	259
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	260 bool qt_interpreter_events::prompt_new_edit_file (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	261 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	262 QSettings *settings = resource_manager::get_settings ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	263
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	264 if (! settings \|\| settings->value ("editor/create_new_file",false).toBool ())
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	265 return true;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	266
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	267 std::string abs_fname = sys::env::make_absolute (file);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	268
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	269 QStringList btn;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	270 QStringList role;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	271 role << "YesRole" << "RejectRole";
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	272 btn << tr ("Create") << tr ("Cancel");
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	273
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	274 QString answer = uiwidget_creator.message_dialog
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	275 (tr ("File\n%1\ndoes not exist. Do you want to create it?").
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	276 arg (QString::fromStdString (abs_fname)),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	277 tr ("Octave Editor"), "quest", btn, tr ("Create"), role);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	278
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	279 return (answer == tr ("Create"));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	280 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	281
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	282 // Prompt to allow file to be run by setting cwd (or if
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	283 // addpath_option==true, alternatively setting the path).
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	284
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	285 int
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	286 qt_interpreter_events::debug_cd_or_addpath_error (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	287 const std::string& dir,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	288 bool addpath_option)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	289 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	290 int retval = -1;
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	291
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	292 QString qdir = QString::fromStdString (dir);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	293 QString qfile = QString::fromStdString (file);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	294 QString msg
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	295 = (addpath_option
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	296 ? 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)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	297 : 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));
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	298
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	299 QString title = tr ("Change Directory or Add Directory to Load Path");
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	300
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	301 QString cd_txt = tr ("&Change Directory");
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	302 QString addpath_txt = tr ("&Add Directory to Load Path");
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	303 QString cancel_txt = tr ("Cancel");
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	304
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	305 QStringList btn;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	306 QStringList role;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	307 btn << cd_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	308 role << "YesRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	309 if (addpath_option)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	310 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	311 btn << addpath_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	312 role << "AcceptRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	313 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	314 btn << cancel_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	315 role << "RejectRole";
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	316
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	317 QString result
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	318 = uiwidget_creator.message_dialog (msg, title, "quest", btn,
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	319 cancel_txt, role);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	320
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	321 if (result == cd_txt)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	322 retval = 1;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	323 else if (result == addpath_txt)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	324 retval = 2;
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	325
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	326 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	327 }
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	328
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	329 uint8NDArray qt_interpreter_events::get_named_icon (const std::string& icon_name)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	330 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	331 uint8NDArray retval;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	332 QIcon icon = resource_manager::icon (QString::fromStdString (icon_name));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	333 if (! icon.isNull ())
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	334 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	335 QImage img = icon.pixmap (QSize (32, 32)).toImage ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	336
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	337 if (img.format () == QImage::Format_ARGB32_Premultiplied)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	338 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	339 retval.resize (dim_vector (img.height (), img.width (), 4), 0);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	340 uint8_t* bits = img.bits ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	341 for (int i = 0; i < img.height (); i++)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	342 for (int j = 0; j < img.width (); j++)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	343 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	344 retval(i,j,2) = bits[0];
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	345 retval(i,j,1) = bits[1];
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	346 retval(i,j,0) = bits[2];
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	347 retval(i,j,3) = bits[3];
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	348 bits += 4;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	349 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	350 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	351 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	352 return retval;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	353 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	354
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	355 std::string
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	356 qt_interpreter_events::gui_preference (const std::string& key,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	357 const std::string& value)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	358 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	359 QString pref_value;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	360
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	361 // Lock the mutex before signaling
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	362 lock ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	363
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	364 // Emit the signal for changing or getting a preference
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	365 emit gui_preference_signal (QString::fromStdString (key),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	366 QString::fromStdString (value), &pref_value);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	367
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	368 // Wait for the GUI and unlock when resumed
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	369 wait ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	370 unlock ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	371
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	372 return pref_value.toStdString ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	373 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	374
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	375 bool qt_interpreter_events::copy_image_to_clipboard (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	376 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	377 emit copy_image_to_clipboard_signal (QString::fromStdString (file), true);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	378
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	379 return true;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	380 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	381
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	382 void qt_interpreter_events::execute_command_in_terminal
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	383 (const std::string& command)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	384 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	385 emit execute_command_in_terminal_signal (QString::fromStdString (command));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	386 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	387
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	388 void qt_interpreter_events::register_doc (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	389 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	390 emit register_doc_signal (QString::fromStdString (file));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	391 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	392
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	393 void qt_interpreter_events::unregister_doc (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	394 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	395 emit unregister_doc_signal (QString::fromStdString (file));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	396 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	397
27409 a0d49e55acae rename change_directory to directory_changed in event manager John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	398 void qt_interpreter_events::directory_changed (const std::string& dir)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	399 {
27409 a0d49e55acae rename change_directory to directory_changed in event manager John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	400 emit directory_changed_signal (QString::fromStdString (dir));
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	401 }
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	402
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	403 void qt_interpreter_events::file_remove (const std::string& old_name,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	404 const std::string& new_name)
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	405 {
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	406 // Lock the mutex before signaling
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	407 lock ();
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	408
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	409 // Emit the signal for the editor for closing the file if it is open
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	410 emit file_remove_signal (QString::fromStdString (old_name),
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	411 QString::fromStdString (new_name));
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	412
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	413 // Wait for the GUI and unlock when resumed
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	414 wait ();
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	415 unlock ();
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	416 }
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	417
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	418 void qt_interpreter_events::file_renamed (bool load_new)
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	419 {
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	420 emit file_renamed_signal (load_new);
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	421 }
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	422
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	423 void qt_interpreter_events::set_workspace (bool top_level, bool debug,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	424 const symbol_info_list& syminfo,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	425 bool update_variable_editor)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	426 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	427 if (! top_level && ! debug)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	428 return;
19904 793230bb81d4 don't update workspace viewer unless at top level (bug #44156) John W. Eaton <jwe@octave.org> parents: 19714 diff changeset	429
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25948 diff changeset	430 emit set_workspace_signal (top_level, debug, syminfo);
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23807 diff changeset	431
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	432 if (update_variable_editor)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	433 emit refresh_variable_editor_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	434 }
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	435
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	436 void qt_interpreter_events::clear_workspace (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	437 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	438 emit clear_workspace_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	439 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	440
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	441 void qt_interpreter_events::set_history (const string_vector& hist)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	442 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	443 QStringList qt_hist;
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	444
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	445 for (octave_idx_type i = 0; i < hist.numel (); i++)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	446 qt_hist.append (QString::fromStdString (hist[i]));
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	447
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	448 emit set_history_signal (qt_hist);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	449 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	450
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	451 void qt_interpreter_events::append_history (const std::string& hist_entry)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	452 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	453 emit append_history_signal (QString::fromStdString (hist_entry));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	454 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	455
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	456 void qt_interpreter_events::clear_history (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	457 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	458 emit clear_history_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	459 }
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	460
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	461 void qt_interpreter_events::pre_input_event (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	462 { }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	463
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	464 void qt_interpreter_events::post_input_event (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	465 { }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	466
27392 820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	467 void qt_interpreter_events::enter_debugger_event (const std::string& /fcn_name/,
820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	468 const std::string& fcn_file_name,
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	469 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	470 {
27392 820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	471 if (fcn_file_name.empty ())
25557 bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	472 return;
bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	473
27392 820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	474 insert_debugger_pointer (fcn_file_name, line);
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	475
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	476 emit enter_debugger_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	477 }
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	478
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	479 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	480 qt_interpreter_events::execute_in_debugger_event (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	481 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	482 {
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	483 delete_debugger_pointer (file, line);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	484 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	485
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	486 void qt_interpreter_events::exit_debugger_event (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	487 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	488 emit exit_debugger_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	489 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	490
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	491 // Display (if @insert true) or remove the appropriate symbol for a breakpoint
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	492 // in @file at @line with condition @cond.
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	493 void qt_interpreter_events::update_breakpoint (bool insert,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	494 const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	495 int line,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	496 const std::string& cond)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	497 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	498 emit update_breakpoint_marker_signal (insert, QString::fromStdString (file),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	499 line, QString::fromStdString (cond));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	500 }
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	501
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	502 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	503 qt_interpreter_events::insert_debugger_pointer (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	504 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	505 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	506 emit insert_debugger_pointer_signal (QString::fromStdString (file), line);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	507 }
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	508
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	509 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	510 qt_interpreter_events::delete_debugger_pointer (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	511 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	512 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	513 emit delete_debugger_pointer_signal (QString::fromStdString (file), line);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	514 }
17029 359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	515 }

Mercurial > octave

annotate libgui/src/qt-interpreter-events.cc @ 27552:de5129cb0796