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

annotate libgui/src/qt-interpreter-events.cc @ 27284:1a8762e5662b

remove "do_" prefix from interpreter_events class methods * event-manager.h, event-manager.cc, qt-interpreter-events.h, qt-interpreter-events.cc: Remove "do_" prefix from function names. That prefix is no longer needed to distinguish static class methods from the corresponding virtual methods now that we've eliminated the static methods and the virtual methods are in a separate class. Minor style fixes.

author	John W. Eaton <jwe@octave.org>
date	Tue, 23 Jul 2019 10:32:32 -0400
parents	7455523fdf01
children	5f170ea12fa1

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
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	35 #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	36 #include "str-vec.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	37
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	38 #include "builtin-defun-decls.h"
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	39 #include "dialog.h"
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	40 #include "error.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	41 #include "interpreter-private.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	42 #include "load-path.h"
24641 7d177be54c37 pass variable value to variable editor in addition to variable name John W. Eaton <jwe@octave.org> parents: 24632 diff changeset	43 #include "ov.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	44 #include "octave.h"
bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	45 #include "oct-map.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	46 #include "syminfo.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	47 #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	48
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	49 #include "qt-interpreter-events.h"
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	50 #include "resource-manager.h"
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24641 diff changeset	51
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)
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	54
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	55 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	56 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	57 qt_interpreter_events::qt_interpreter_events (void)
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	58 : 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	59 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	60 qRegisterMetaType<octave_value> ("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	61 qRegisterMetaType<symbol_info_list> ("symbol_info_list");
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	62 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	63
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	64 bool qt_interpreter_events::confirm_shutdown (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	65 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	66 // Lock the mutex before emitting signal.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	67 lock ();
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	68
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	69 emit confirm_shutdown_signal ();
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	70
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	71 // Wait while the GUI shuts down.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	72 wait ();
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	73
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	74 // The GUI has sent a signal and the thread has been awakened.
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	75
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	76 unlock ();
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	77
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	78 return m_shutdown_confirm_result;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	79 }
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	80
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	81 bool qt_interpreter_events::copy_image_to_clipboard (const std::string& file)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	82 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	83 emit copy_image_to_clipboard_signal (QString::fromStdString (file), true);
20113 c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	84
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	85 return true;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	86 }
20113 c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	87
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	88 bool qt_interpreter_events::edit_file (const std::string& file)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	89 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	90 emit edit_file_signal (QString::fromStdString (file));
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	91
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	92 return true;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	93 }
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	94
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	95 bool qt_interpreter_events::prompt_new_edit_file (const std::string& file)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	96 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	97 QSettings *settings = resource_manager::get_settings ();
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	98
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	99 if (! settings \|\| settings->value ("editor/create_new_file",false).toBool ())
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	100 return true;
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	101
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 26453 diff changeset	102 std::string abs_fname = sys::env::make_absolute (file);
25773 e222da9beaac fix prompt when editing a new m-file wit absolute path (bug #54463) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	103
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	104 QStringList btn;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	105 QStringList role;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	106 role << "YesRole" << "RejectRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	107 btn << tr ("Create") << tr ("Cancel");
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	108
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	109 // Lock mutex before signaling.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	110 uiwidget_creator.lock ();
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
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	112 uiwidget_creator.signal_dialog
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	113 (tr ("File\n%1\ndoes not exist. Do you want to create it?").
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	114 arg (QString::fromStdString (abs_fname)),
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	115 tr ("Octave Editor"), "quest", btn, tr ("Create"), role);
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	116
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	117 // Wait while the user is responding to message box.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	118 uiwidget_creator.wait ();
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	119
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	120 // The GUI has sent a signal and the thread has been awakened.
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	121
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	122 QString answer = uiwidget_creator.get_dialog_button ();
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	123
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	124 uiwidget_creator.unlock ();
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	125
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	126 return (answer == tr ("Create"));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	127 }
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	128
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	129 uint8NDArray qt_interpreter_events::get_named_icon (const std::string& icon_name)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	130 {
25921 9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	131 uint8NDArray retval;
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	132 QIcon icon = resource_manager::icon (QString::fromStdString (icon_name));
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	133 if (! icon.isNull ())
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	134 {
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	135 QImage img = icon.pixmap (QSize (32, 32)).toImage ();
25948 700b3f415ebe maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25945 diff changeset	136
25921 9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	137 if (img.format () == QImage::Format_ARGB32_Premultiplied)
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	138 {
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	139 retval.resize (dim_vector (img.height (), img.width (), 4), 0);
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	140 uint8_t* bits = img.bits ();
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	141 for (int i = 0; i < img.height (); i++)
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	142 for (int j = 0; j < img.width (); j++)
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	143 {
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	144 retval(i,j,2) = bits[0];
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	145 retval(i,j,1) = bits[1];
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	146 retval(i,j,0) = bits[2];
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	147 retval(i,j,3) = bits[3];
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	148 bits += 4;
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	149 }
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	150 }
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	151 }
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25773 diff changeset	152 return retval;
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	153 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	154
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	155 std::string
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	156 qt_interpreter_events::question_dialog (const std::string& msg,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	157 const std::string& title,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	158 const std::string& btn1,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	159 const std::string& btn2,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	160 const std::string& btn3,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	161 const std::string& btndef)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	162 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	163 QStringList btn;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	164 QStringList role;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	165 // Must use ResetRole which is left-aligned for all OS and WM.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	166 role << "ResetRole" << "ResetRole" << "ResetRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	167 btn << QString::fromStdString (btn1);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	168 if (btn2 == "")
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	169 role.removeAt (0);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	170 else
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	171 btn << QString::fromStdString (btn2);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	172 btn << QString::fromStdString (btn3);
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	173
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	174 // Lock mutex before signaling.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	175 uiwidget_creator.lock ();
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	176
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	177 uiwidget_creator.signal_dialog (QString::fromStdString (msg),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	178 QString::fromStdString (title),
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	179 "quest", btn,
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	180 QString::fromStdString (btndef),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	181 role);
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	182
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	183 // Wait while the user is responding to message box.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	184 uiwidget_creator.wait ();
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	185
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	186 // The GUI has sent a signal and the thread has been awakened.
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	187
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	188 std::string answer = uiwidget_creator.get_dialog_button ().toStdString ();
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	189
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	190 uiwidget_creator.unlock ();
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	191
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	192 return answer;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	193 }
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	194
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	195 static QStringList
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	196 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	197 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	198 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	199
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25060 diff changeset	200 for (auto it = lst.begin (); it != lst.end (); it++)
3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25060 diff changeset	201 retval.append (QString::fromStdString (*it));
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	202
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	203 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	204 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	205
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	206 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	207 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	208 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	209 QStringList retval;
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	210
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	211 // 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	212 // 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	213 // (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	214 // 'FilterName (space separated exts)'.
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	215
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25060 diff changeset	216 for (auto it = lst.begin (); it != lst.end (); it++)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	217 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	218 QString ext = QString::fromStdString (it->first);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	219 QString name = QString::fromStdString (it->second);
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	220
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	221 // 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	222 // list.
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	223
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	224 name.replace (QRegExp ("\\(.*\\)"), "");
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	225 ext.replace (";", " ");
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	226
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	227 if (name.isEmpty ())
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	228 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	229 // 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	230 name = ext.toUpper () + " Files";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	231 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	232
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	233 retval.append (name + " (" + ext + ')');
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	234 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	235
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	236 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	237 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	238
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	239 std::pair<std::list<int>, int>
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	240 qt_interpreter_events::list_dialog (const std::list<std::string>& list,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	241 const std::string& mode,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	242 int width, int height,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	243 const std::list<int>& initial,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	244 const std::string& name,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	245 const std::list<std::string>& prompt,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	246 const std::string& ok_string,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	247 const std::string& cancel_string)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	248 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	249 // Lock mutex before signaling.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	250 uiwidget_creator.lock ();
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	251
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	252 uiwidget_creator.signal_listview (make_qstring_list (list),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	253 QString::fromStdString (mode),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	254 width, height,
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	255 QList<int>::fromStdList (initial),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	256 QString::fromStdString (name),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	257 make_qstring_list (prompt),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	258 QString::fromStdString (ok_string),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	259 QString::fromStdString (cancel_string));
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	260
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	261 // Wait while the user is responding to message box.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	262 uiwidget_creator.wait ();
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	263
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	264 // The GUI has sent a signal and the thread has been awakened.
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	265
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	266 const QIntList *selected = uiwidget_creator.get_list_index ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	267 int ok = uiwidget_creator.get_dialog_result ();
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	268
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	269 uiwidget_creator.unlock ();
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	270
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	271 return std::pair<std::list<int>, int> (selected->toStdList (), ok);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	272 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	273
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	274 std::list<std::string>
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	275 qt_interpreter_events::input_dialog (const std::list<std::string>& prompt,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	276 const std::string& title,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	277 const std::list<float>& nr,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	278 const std::list<float>& nc,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	279 const std::list<std::string>& defaults)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	280 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	281 std::list<std::string> 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	282
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	283 // Lock mutex before signaling.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	284 uiwidget_creator.lock ();
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	285
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	286 uiwidget_creator.signal_inputlayout (make_qstring_list (prompt),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	287 QString::fromStdString (title),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	288 QFloatList::fromStdList (nr),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	289 QFloatList::fromStdList (nc),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	290 make_qstring_list (defaults));
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	291
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	292 // Wait while the user is responding to message box.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	293 uiwidget_creator.wait ();
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	294
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	295 // The GUI has sent a signal and the thread has been awakened.
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	296
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	297 const QStringList *inputLine = uiwidget_creator.get_string_list ();
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	298
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	299 uiwidget_creator.unlock ();
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	300
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25060 diff changeset	301 for (auto it = inputLine->begin (); it != inputLine->end (); it++)
3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25060 diff changeset	302 retval.push_back (it->toStdString ());
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	303
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	304 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	305 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	306
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	307 std::list<std::string>
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	308 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	309 const std::string& title,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	310 const std::string& filename,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	311 const std::string& dirname,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	312 const std::string& multimode)
24718 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 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	315
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	316 // Lock mutex before signaling.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	317 uiwidget_creator.lock ();
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	318
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	319 uiwidget_creator.signal_filedialog (make_filter_list (filter),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	320 QString::fromStdString (title),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	321 QString::fromStdString (filename),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	322 QString::fromStdString (dirname),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	323 QString::fromStdString (multimode));
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	324
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	325 // Wait while the user is responding to dialog.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	326 uiwidget_creator.wait ();
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	327
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	328 // The GUI has sent a signal and the thread has been awakened.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	329
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	330 // Add all the file dialog results to a string list.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	331 const QStringList *inputLine = uiwidget_creator.get_string_list ();
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	332
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25060 diff changeset	333 for (auto it = inputLine->begin (); it != inputLine->end (); it++)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	334 retval.push_back (it->toStdString ());
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	335
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	336 retval.push_back (uiwidget_creator.get_dialog_path ()->toStdString ());
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27264 diff changeset	337 retval.push_back ((QString ("%1").arg (uiwidget_creator.get_dialog_result ())).toStdString ());
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	338
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	339 uiwidget_creator.unlock ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	340
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	341 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	342 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	343
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	344 // Prompt to allow file to be run by setting cwd (or if
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	345 // addpath_option==true, alternatively setting the path). This uses a
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	346 // QMessageBox unlike other functions in this file, because
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	347 // uiwidget_creator.waitcondition.wait hangs when called from
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	348 // file_editor_tab::handle_context_menu_break_condition(). (FIXME:
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	349 // why hang?)
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	350
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	351 int
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	352 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	353 const std::string& dir,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	354 bool addpath_option)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	355 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	356 int retval = -1;
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	357
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	358 QString qdir = QString::fromStdString (dir);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	359 QString qfile = QString::fromStdString (file);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	360 QString msg
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	361 = (addpath_option
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	362 ? 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	363 : 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	364
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	365 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	366
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	367 QString cd_txt = tr ("&Change Directory");
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	368 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	369 QString cancel_txt = tr ("Cancel");
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	370
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	371 QStringList btn;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	372 QStringList role;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	373 btn << cd_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	374 role << "YesRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	375 if (addpath_option)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	376 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	377 btn << addpath_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	378 role << "AcceptRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	379 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	380 btn << cancel_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	381 role << "RejectRole";
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	382
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	383 // Lock mutex before signaling.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	384 uiwidget_creator.lock ();
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	385
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	386 uiwidget_creator.signal_dialog (msg, title, "quest", btn, cancel_txt, role);
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	387
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	388 // Wait while the user is responding to message box.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	389 uiwidget_creator.wait ();
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	390
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	391 // The GUI has sent a signal and the thread has been awakened.
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	392
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	393 QString result = uiwidget_creator.get_dialog_button ();
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	394
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	395 uiwidget_creator.unlock ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	396
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	397 if (result == cd_txt)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	398 retval = 1;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	399 else if (result == addpath_txt)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	400 retval = 2;
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	401
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	402 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	403 }
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	404
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	405 void qt_interpreter_events::change_directory (const std::string& dir)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	406 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	407 emit change_directory_signal (QString::fromStdString (dir));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	408 }
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	409
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	410 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	411 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	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 // 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	414 lock ();
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	415
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	416 // 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	417 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	418 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	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 // 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	421 wait ();
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	422 unlock ();
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	423 }
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	424
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	425 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	426 {
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	427 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	428 }
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	429
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	430 void qt_interpreter_events::execute_command_in_terminal
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	431 (const std::string& command)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	432 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	433 emit execute_command_in_terminal_signal (QString::fromStdString (command));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	434 }
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 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::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	437 const symbol_info_list& syminfo,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	438 bool update_variable_editor)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	439 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	440 if (! top_level && ! debug)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	441 return;
19904 793230bb81d4 don't update workspace viewer unless at top level (bug #44156) John W. Eaton <jwe@octave.org> parents: 19714 diff changeset	442
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	443 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	444
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	445 if (update_variable_editor)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	446 emit refresh_variable_editor_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	447 }
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	448
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	449 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	450 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	451 emit clear_workspace_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	452 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	453
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	454 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	455 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	456 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	457
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	458 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	459 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	460
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	461 emit set_history_signal (qt_hist);
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::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	465 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	466 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	467 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	468
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	469 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	470 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	471 emit clear_history_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	472 }
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	473
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	474 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	475 { }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	476
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	477 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	478 { }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	479
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	480 void qt_interpreter_events::enter_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 {
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	483 interpreter& interp
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	484 = __get_interpreter__ ("qt_interpreter_events::enter_debugger_event");
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	485
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	486 octave_value_list fct = F__which__ (interp, ovl (file),0);
bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	487 octave_map map = fct(0).map_value ();
bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	488
25616 bd362df6277c use std::string instead of QString when the latter is not required Torsten <mttl@mailbox.org> parents: 25557 diff changeset	489 std::string type = map.contents ("type").data ()[0].string_value ();
bd362df6277c use std::string instead of QString when the latter is not required Torsten <mttl@mailbox.org> parents: 25557 diff changeset	490 if (type == "command-line function")
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	491 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	492
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	493 insert_debugger_pointer (file, line);
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	494
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	495 emit enter_debugger_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	496 }
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	497
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	498 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	499 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	500 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	501 {
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	502 delete_debugger_pointer (file, line);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	503 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	504
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	505 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	506 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	507 emit exit_debugger_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	508 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	509
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	510 // 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	511 // 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	512 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	513 const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	514 int line,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	515 const std::string& cond)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	516 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	517 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	518 line, QString::fromStdString (cond));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	519 }
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	520
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	521 void qt_interpreter_events::show_preferences (void)
27260 5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	522 {
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	523 emit show_preferences_signal ();
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	524 }
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	525
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	526 std::string
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	527 qt_interpreter_events::gui_preference (const std::string& key,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	528 const std::string& value)
27260 5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	529 {
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	530 QString pref_value;
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	531
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	532 // Lock the mutex before signaling
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	533 lock ();
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	534
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	535 // Emit the signal for changing or getting a preference
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	536 emit gui_preference_signal (QString::fromStdString (key),
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	537 QString::fromStdString (value), &pref_value);
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	538
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	539 // Wait for the GUI and unlock when resumed
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	540 wait ();
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	541 unlock ();
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	542
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	543 return pref_value.toStdString ();
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	544 }
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	545
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	546 void qt_interpreter_events::show_doc (const std::string& file)
27260 5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	547 {
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	548 emit show_doc_signal (QString::fromStdString (file));
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	549 }
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	550
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	551 void qt_interpreter_events::register_doc (const std::string& file)
27260 5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	552 {
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	553 emit register_doc_signal (QString::fromStdString (file));
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	554 }
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	555
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	556 void qt_interpreter_events::unregister_doc (const std::string& file)
27260 5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	557 {
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	558 emit unregister_doc_signal (QString::fromStdString (file));
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	559 }
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	560
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	561 void qt_interpreter_events::edit_variable (const std::string& expr,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	562 const octave_value& val)
27260 5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	563 {
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	564 emit edit_variable_signal (QString::fromStdString (expr), val);
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	565 }
5ac60319575b separate octave_link event queue from events and actions John W. Eaton <jwe@octave.org> parents: 27217 diff changeset	566
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	567 bool qt_interpreter_events::file_in_path (const std::string& file,
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	568 const std::string& dir)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	569 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	570
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	571 bool ok = false;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	572 bool addpath_option = true;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	573
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24718 diff changeset	574 std::string curr_dir = sys::env::get_current_directory ();
16426 203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16424 diff changeset	575
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	576 if (same_file (curr_dir, dir))
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	577 ok = true;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	578 else
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	579 {
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	580 load_path& lp
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	581 = __get_load_path__ ("qt_interpreter_events::file_in_path");
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	582
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	583 bool dir_in_load_path = lp.contains_canonical (dir);
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	584
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	585 // get base name, allowing "@class/method.m" (bug #41514)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	586 std::string base_file = (file.length () > dir.length ())
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	587 ? file.substr (dir.length () + 1)
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24718 diff changeset	588 : sys::env::base_pathname (file);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	589
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	590 std::string lp_file = lp.find_file (base_file);
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	591
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	592 if (dir_in_load_path)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	593 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	594 if (same_file (lp_file, file))
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	595 ok = true;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	596 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	597 else
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	598 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	599 // File directory is not in path. Is the file in the path in
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	600 // the current directory? If so, then changing the current
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	601 // directory will be needed. Adding directory to path is
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	602 // not enough because the file in the current directory would
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	603 // still be found.
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	604
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	605 if (same_file (lp_file, base_file))
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	606 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	607 if (same_file (curr_dir, dir))
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	608 ok = true;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	609 else
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	610 addpath_option = false;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	611 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	612 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	613 }
21717 efdf6424003a Allow GUI to set breakpoints in @class/method (bug #41514). Lachlan Andrew <lachlanbis@gmail.com> parents: 21578 diff changeset	614
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	615 if (! ok)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	616 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	617 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	618 = __get_event_manager__ ("qt_interpreter_events::file_in_path");
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	619
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	620 int action = evmgr.debug_cd_or_addpath_error (file, dir, addpath_option);
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	621
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	622 switch (action)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	623 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	624 case 1:
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	625 Fcd (ovl (dir));
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	626 ok = true;
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	627 break;
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	628
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	629 case 2:
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	630 {
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	631 load_path& lp
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	632 = __get_load_path__ ("qt_interpreter_events::file_in_path");
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	633
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	634 lp.prepend (dir);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	635 ok = true;
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	636 }
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	637 break;
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	638
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	639 default:
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	640 break;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	641 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	642 }
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	643
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	644 return ok;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	645 }
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	646
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	647 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	648 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	649 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	650 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	651 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	652 }
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	653
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	654 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	655 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	656 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	657 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	658 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	659 }
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	660 }

Mercurial > octave

annotate libgui/src/qt-interpreter-events.cc @ 27284:1a8762e5662b