octave: libgui/src/octave-qt-link.cc annotate

annotate libgui/src/octave-qt-link.cc @ 21311:718332a58d35

Fix left mouse button in editor margin bug from cset 65827e9cccb8 * octave-qt-link.cc (do_debug_cd_or_addpath_error): Back out 65827e9cccb8 to use uiwidget_creator instead of QMessageBox. * file_editor_tab.cc (handle_context_menu_break_condition): Validate condition using bp_table::condition_valid, to allow file_in_path to be called from a callback.jo * debug.{cc,h} (condition_valid): make member method, not static function.

author	Lachlan Andrew <lachlanbis@gmail.com>
date	Thu, 11 Feb 2016 19:59:32 +1100
parents	fc6a9bd59094
children	062c65569ad7

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
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19596 diff changeset	3 Copyright (C) 2013-2015 John W. Eaton
4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19596 diff changeset	4 Copyright (C) 2011-2015 Jacob Dawid
4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19596 diff changeset	5 Copyright (C) 2011-2015 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
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	10 under the terms of the GNU General Public License as published by the
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	12 option) any later version.
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	13
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See 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	17 for more details.
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
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	21 <http://www.gnu.org/licenses/>.
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
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	25 #ifdef 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
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	29 #include <QStringList>
17884 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 <QDialog>
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	31 #include <QDir>
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	32 #include <QPushButton>
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	33
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	34 #include "str-vec.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	35 #include "dialog.h"
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	36 #include "error.h"
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	37 #include "workspace-element.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	38 #include "builtin-defun-decls.h"
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	39 #include "load-path.h"
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	40 #include "oct-env.h"
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	41 #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	42
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "octave-qt-link.h"
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	44
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	45 #include "resource-manager.h"
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	46
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	47 #include <unistd.h>
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 17920 diff changeset	48 octave_qt_link::octave_qt_link (QWidget *p)
17918 a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	49 : octave_link (), main_thread (new QThread ()),
17919 b6d07dd90f3d rename octave_main_thread to octave_interpreter John W. Eaton <jwe@octave.org> parents: 17918 diff changeset	50 command_interpreter (new octave_interpreter ())
17918 a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	51 {
20132 d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	52 _current_directory = "";
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	53 _new_dir = true;
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	54
17918 a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	55 connect (this, SIGNAL (execute_interpreter_signal (void)),
17919 b6d07dd90f3d rename octave_main_thread to octave_interpreter John W. Eaton <jwe@octave.org> parents: 17918 diff changeset	56 command_interpreter, SLOT (execute (void)));
17918 a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	57
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 17920 diff changeset	58 connect (command_interpreter, SIGNAL (octave_ready_signal ()),
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 17920 diff changeset	59 p, SLOT (handle_octave_ready ()));
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 17920 diff changeset	60
17919 b6d07dd90f3d rename octave_main_thread to octave_interpreter John W. Eaton <jwe@octave.org> parents: 17918 diff changeset	61 command_interpreter->moveToThread (main_thread);
17918 a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	62
a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	63 main_thread->start ();
a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	64 }
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	65
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	66 octave_qt_link::~octave_qt_link (void) { }
16432 fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	67
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	68 void
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	69 octave_qt_link::execute_interpreter (void)
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	70 {
17918 a38cee8f0a9b derive octave_main_thread from QObject, not QThread John W. Eaton <jwe@octave.org> parents: 17884 diff changeset	71 emit execute_interpreter_signal ();
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	72 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	73
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	74 bool
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	75 octave_qt_link::do_confirm_shutdown (void)
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	76 {
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	77 // Lock the mutex before emitting signal.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	78 mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	79
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	80 emit confirm_shutdown_signal ();
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	81
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	82 // Wait while the GUI shuts down.
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	83 waitcondition.wait (&mutex);
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	84
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	85 // The GUI has sent a signal and the thread has been awakened.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	86
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	87 mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	88
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	89 return _shutdown_confirm_result;
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	90 }
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	91
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	92 bool
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	93 octave_qt_link::do_exit (int status)
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	94 {
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	95 emit exit_app_signal (status);
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	96
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	97 // Could wait for a while and then timeout, but for now just
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	98 // assume the GUI application exit will be without problems.
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	99 return true;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	100 }
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	101
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	102 bool
20113 c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	103 octave_qt_link::do_copy_image_to_clipboard (const std::string& file)
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	104 {
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	105 emit copy_image_to_clipboard_signal (QString::fromStdString (file), true);
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	106
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	107 return true;
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	108 }
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	109
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	110 bool
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	111 octave_qt_link::do_edit_file (const std::string& file)
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	112 {
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	113 emit edit_file_signal (QString::fromStdString (file));
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	114
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	115 return true;
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	116 }
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	117
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	118 bool
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	119 octave_qt_link::do_prompt_new_edit_file (const std::string& file)
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	120 {
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	121 QSettings *settings = resource_manager::get_settings ();
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	122
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	123 if (settings->value ("editor/create_new_file",false).toBool ())
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	124 return true;
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	125
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	126 QFileInfo file_info (QString::fromStdString (file));
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	127 QStringList btn;
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	128 QStringList role;
19314 2b708273548d button order in dialog for creating a non-existing file (bug #43537) Torsten <ttl@justmail.de> parents: 18345 diff changeset	129 role << "YesRole" << "RejectRole";
2b708273548d button order in dialog for creating a non-existing file (bug #43537) Torsten <ttl@justmail.de> parents: 18345 diff changeset	130 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	131
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	132 // Lock mutex before signaling.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	133 uiwidget_creator.mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	134
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	135 uiwidget_creator.signal_dialog (
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	136 tr ("File\n%1\ndoes not exist. Do you want to create it?").
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	137 arg (QDir::currentPath () + QDir::separator ()
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	138 + QString::fromStdString (file)),
19314 2b708273548d button order in dialog for creating a non-existing file (bug #43537) Torsten <ttl@justmail.de> parents: 18345 diff changeset	139 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	140
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	141 // Wait while the user is responding to message box.
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	142 uiwidget_creator.waitcondition.wait (&uiwidget_creator.mutex);
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	143
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	144 // The GUI has sent a signal and the thread has been awakened.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	145
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	146 QString answer = uiwidget_creator.get_dialog_button ();
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	147
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	148 uiwidget_creator.mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	149
19314 2b708273548d button order in dialog for creating a non-existing file (bug #43537) Torsten <ttl@justmail.de> parents: 18345 diff changeset	150 return (answer == tr ("Create"));
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	151 }
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	152
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	153 int
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	154 octave_qt_link::do_message_dialog (const std::string& dlg,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	155 const std::string& msg,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	156 const std::string& title)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	157 {
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	158 // Lock mutex before signaling.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	159 uiwidget_creator.mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	160
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	161 uiwidget_creator.signal_dialog (QString::fromStdString (msg),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	162 QString::fromStdString (title),
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	163 QString::fromStdString (dlg),
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	164 QStringList (), QString (),
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	165 QStringList ());
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	166
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	167 // Wait while the user is responding to message box.
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	168 uiwidget_creator.waitcondition.wait (&uiwidget_creator.mutex);
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	169
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	170 // 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	171
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	172 int answer = uiwidget_creator.get_dialog_result ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	173
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	174 uiwidget_creator.mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	175
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 return answer;
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	177 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	178
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	179 std::string
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	180 octave_qt_link::do_question_dialog (const std::string& msg,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	181 const std::string& title,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	182 const std::string& btn1,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	183 const std::string& btn2,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	184 const std::string& btn3,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	185 const std::string& btndef)
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	186 {
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	187 QStringList btn;
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	188 QStringList role;
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	189 role << "AcceptRole" << "AcceptRole" << "AcceptRole";
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	190 btn << QString::fromStdString (btn1);
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	191 if (btn2 == "")
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	192 role.removeAt (0);
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	193 else
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	194 btn << QString::fromStdString (btn2);
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	195 btn << QString::fromStdString (btn3);
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	196
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	197 // Lock mutex before signaling.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	198 uiwidget_creator.mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	199
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	200 uiwidget_creator.signal_dialog (QString::fromStdString (msg),
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	201 QString::fromStdString (title),
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	202 "quest",
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	203 btn,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	204 QString::fromStdString (btndef),
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	205 role);
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	206
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	207 // Wait while the user is responding to message box.
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	208 uiwidget_creator.waitcondition.wait (&uiwidget_creator.mutex);
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	209
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	210 // 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	211
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	212 std::string answer = uiwidget_creator.get_dialog_button ().toStdString ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	213
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	214 uiwidget_creator.mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	215
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	216 return answer;
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	217 }
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	218
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	219 static QStringList
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	220 make_qstring_list (const std::list<std::string>& lst)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	221 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	222 QStringList retval;
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	223
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	224 for (std::list<std::string>::const_iterator it = lst.begin ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	225 it != lst.end (); it++)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	226 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	227 retval.append (QString::fromStdString (*it));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	228 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	229
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	230 return retval;
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	231 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	232
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	233 static QStringList
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	234 make_filter_list (const octave_link::filter_list& lst)
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	235 {
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	236 QStringList retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	237
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	238 // We have pairs of data, first being the list of extensions
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	239 // exta;exb;extc etc second the name to use as filter name
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	240 // (optional). Qt wants a a list of filters in the format of
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	241 // 'FilterName (space separated exts)'.
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	242
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	243 for (octave_link::filter_list::const_iterator it = lst.begin ();
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	244 it != lst.end (); it++)
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	245 {
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	246 QString ext = QString::fromStdString (it->first);
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	247 QString name = QString::fromStdString (it->second);
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	248
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	249 // Strip out extensions from name and replace ';' with spaces in
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	250 // list.
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	251
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	252 name.replace (QRegExp ("\\(.*\\)"), "");
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	253 ext.replace (";", " ");
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	254
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	255 if (name.length () == 0)
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	256 {
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	257 // No name field. Build one from the extensions.
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	258 name = ext.toUpper () + " Files";
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	259 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	260
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	261 retval.append (name + " (" + ext + ")");
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	262 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	263
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	264 return retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	265 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	266
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	267 std::pair<std::list<int>, int>
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	268 octave_qt_link::do_list_dialog (const std::list<std::string>& list,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	269 const std::string& mode,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	270 int width, int height,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	271 const std::list<int>& initial,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	272 const std::string& name,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	273 const std::list<std::string>& prompt,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	274 const std::string& ok_string,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	275 const std::string& cancel_string)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	276 {
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	277 // Lock mutex before signaling.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	278 uiwidget_creator.mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	279
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	280 uiwidget_creator.signal_listview (make_qstring_list (list),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	281 QString::fromStdString (mode),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	282 width, height,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	283 QList<int>::fromStdList (initial),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	284 QString::fromStdString (name),
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	285 make_qstring_list (prompt),
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	286 QString::fromStdString (ok_string),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	287 QString::fromStdString (cancel_string));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	288
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	289 // Wait while the user is responding to message box.
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	290 uiwidget_creator.waitcondition.wait (&uiwidget_creator.mutex);
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
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	292 // The GUI has sent a signal and the thread has been awakened.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	293
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	294 const QIntList *selected = uiwidget_creator.get_list_index ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	295 int ok = uiwidget_creator.get_dialog_result ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	296
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	297 uiwidget_creator.mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	298
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	299 return std::pair<std::list<int>, int> (selected->toStdList (), ok);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	300 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	301
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	302 std::list<std::string>
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	303 octave_qt_link::do_input_dialog (const std::list<std::string>& prompt,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	304 const std::string& title,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	305 const std::list<float>& nr,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	306 const std::list<float>& nc,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	307 const std::list<std::string>& defaults)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	308 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	309 std::list<std::string> retval;
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	310
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	311 // Lock mutex before signaling.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	312 uiwidget_creator.mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	313
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	314 uiwidget_creator.signal_inputlayout (make_qstring_list (prompt),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	315 QString::fromStdString (title),
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	316 QFloatList::fromStdList (nr),
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	317 QFloatList::fromStdList (nc),
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	318 make_qstring_list (defaults));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	319
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	320 // Wait while the user is responding to message box.
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	321 uiwidget_creator.waitcondition.wait (&uiwidget_creator.mutex);
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	322
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	323 // 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	324
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	325 const QStringList *inputLine = uiwidget_creator.get_string_list ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	326
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	327 uiwidget_creator.mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	328
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	329 for (QStringList::const_iterator it = inputLine->begin ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	330 it != inputLine->end (); it++)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	331 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	332 retval.push_back (it->toStdString ());
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	333 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	334
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	335 return retval;
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	336 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	337
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	338 std::list<std::string>
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	339 octave_qt_link::do_file_dialog (const filter_list& filter,
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	340 const std::string& title,
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	341 const std::string& filename,
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	342 const std::string& dirname,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	343 const std::string& multimode)
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	344 {
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	345 std::list<std::string> retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	346
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	347 // Lock mutex before signaling.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	348 uiwidget_creator.mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	349
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	350 uiwidget_creator.signal_filedialog (make_filter_list (filter),
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	351 QString::fromStdString (title),
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	352 QString::fromStdString (filename),
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	353 QString::fromStdString (dirname),
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	354 QString::fromStdString (multimode));
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	355
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	356 // Wait while the user is responding to dialog.
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	357 uiwidget_creator.waitcondition.wait (&uiwidget_creator.mutex);
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	358
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	359 // The GUI has sent a signal and the thread has been awakened.
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	360
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	361 // Add all the file dialog results to a string list.
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	362 const QStringList *inputLine = uiwidget_creator.get_string_list ();
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	363
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	364 for (QStringList::const_iterator it = inputLine->begin ();
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	365 it != inputLine->end (); it++)
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	366 retval.push_back (it->toStdString ());
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	367
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	368 retval.push_back (uiwidget_creator.get_dialog_path ()->toStdString ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	369 retval.push_back ((QString ("%1").arg (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	370 uiwidget_creator.get_dialog_result ())).toStdString ());
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	371
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	372 uiwidget_creator.mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	373
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	374 return retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	375 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	376
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	377 // Prompt to allow file to be run by setting cwd (or if addpath_option==true,
65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	378 // alternatively setting the path).
65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	379 // This uses a QMessageBox unlike other functions in this file,
65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	380 // because uiwidget_creator.waitcondition.wait hangs when called from
65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	381 // file_editor_tab::handle_context_menu_break_condition(). (FIXME -- why hang?)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	382 int
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	383 octave_qt_link::do_debug_cd_or_addpath_error (const std::string& file,
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	384 const std::string& dir,
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	385 bool addpath_option)
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	386 {
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	387 int retval = -1;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	388
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	389 QString qdir = QString::fromStdString (dir);
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	390 QString qfile = QString::fromStdString (file);
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	391 QString msg
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	392 = (addpath_option
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	393 ? 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)
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	394 : 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	395
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	396 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	397
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	398 QString cd_txt = tr ("Change Directory");
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	399 QString addpath_txt = tr ("Add Directory to Load Path");
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	400 QString cancel_txt = tr ("Cancel");
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	401
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	402 QStringList btn;
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	403 QStringList role;
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	404 btn << cd_txt;
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	405 role << "YesRole";
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	406 if (addpath_option)
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	407 {
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	408 btn << addpath_txt;
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	409 role << "AcceptRole";
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	410 }
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	411 btn << cancel_txt;
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	412 role << "RejectRole";
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	413
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	414 // Lock mutex before signaling.
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	415 uiwidget_creator.mutex.lock ();
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	416
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	417 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	418
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	419 // Wait while the user is responding to message box.
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	420 uiwidget_creator.waitcondition.wait (&uiwidget_creator.mutex);
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	421
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	422 // 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	423
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	424 QString result = uiwidget_creator.get_dialog_button ();
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	425
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	426 uiwidget_creator.mutex.unlock ();
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	427
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	428 if (result == cd_txt)
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	429 retval = 1;
718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	430 else if (result == addpath_txt)
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	431 retval = 2;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	432
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	433 return retval;
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	434 }
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	435
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	436 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	437 octave_qt_link::do_change_directory (const std::string& dir)
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	438 {
20132 d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	439 _current_directory = QString::fromStdString (dir);
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	440 _new_dir = true;
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	441 }
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	442
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	443 void
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	444 octave_qt_link::update_directory ()
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	445 {
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	446 emit change_directory_signal (_current_directory);
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	447 _new_dir = false;
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	448 }
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	449
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	450 void
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	451 octave_qt_link::do_execute_command_in_terminal (const std::string& command)
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	452 {
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	453 emit execute_command_in_terminal_signal (QString::fromStdString (command));
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	454 }
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	455
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	456 void
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20136 diff changeset	457 octave_qt_link::do_set_workspace (bool top_level, bool debug,
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16485 diff changeset	458 const std::list<workspace_element>& ws)
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	459 {
19970 f7846f0ea6db GUI: enable workspace update when debugging (Bug #44455) John Donoghue parents: 19904 diff changeset	460 if (! top_level && ! debug)
19904 793230bb81d4 don't update workspace viewer unless at top level (bug #44156) John W. Eaton <jwe@octave.org> parents: 19714 diff changeset	461 return;
793230bb81d4 don't update workspace viewer unless at top level (bug #44156) John W. Eaton <jwe@octave.org> parents: 19714 diff changeset	462
20132 d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	463 if (_new_dir)
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	464 update_directory ();
d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	465
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	466 QString scopes;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	467 QStringList symbols;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	468 QStringList class_names;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	469 QStringList dimensions;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	470 QStringList values;
17824 86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	471 QIntList complex_flags;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	472
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	473 for (std::list<workspace_element>::const_iterator it = ws.begin ();
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	474 it != ws.end (); it++)
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	475 {
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	476 scopes.append (it->scope ());
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	477 symbols.append (QString::fromStdString (it->symbol ()));
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	478 class_names.append (QString::fromStdString (it->class_name ()));
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	479 dimensions.append (QString::fromStdString (it->dimension ()));
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	480 values.append (QString::fromStdString (it->value ()));
17824 86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	481 complex_flags.append (it->complex_flag ());
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	482 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	483
19970 f7846f0ea6db GUI: enable workspace update when debugging (Bug #44455) John Donoghue parents: 19904 diff changeset	484 emit set_workspace_signal (top_level, debug, scopes, symbols, class_names,
17824 86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	485 dimensions, values, complex_flags);
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	486 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	487
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	488 void
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	489 octave_qt_link::do_clear_workspace (void)
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	490 {
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	491 emit clear_workspace_signal ();
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	492 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	493
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	494 void
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	495 octave_qt_link::do_set_history (const string_vector& hist)
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	496 {
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	497 QStringList qt_hist;
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	498
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20181 diff changeset	499 for (octave_idx_type i = 0; i < hist.numel (); i++)
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	500 qt_hist.append (QString::fromStdString (hist[i]));
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	501
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	502 emit set_history_signal (qt_hist);
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 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
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	505 void
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	506 octave_qt_link::do_append_history (const std::string& hist_entry)
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	507 {
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	508 emit append_history_signal (QString::fromStdString (hist_entry));
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	509 }
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	510
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	511 void
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	512 octave_qt_link::do_clear_history (void)
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	513 {
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	514 emit clear_history_signal ();
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	515 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	516
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	517 void
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	518 octave_qt_link::do_pre_input_event (void)
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	519 {
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	520 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	521
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	522 void
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	523 octave_qt_link::do_post_input_event (void)
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	524 {
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	525 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	526
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	527 void
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	528 octave_qt_link::do_enter_debugger_event (const std::string& file, int line)
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	529 {
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	530 do_insert_debugger_pointer (file, line);
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	531
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	532 emit enter_debugger_signal ();
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	533 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	534
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	535 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	536 octave_qt_link::do_execute_in_debugger_event (const std::string& file, int line)
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	537 {
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	538 do_delete_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	539 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	540
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	541 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	542 octave_qt_link::do_exit_debugger_event (void)
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	543 {
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	544 emit exit_debugger_signal ();
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	545 }
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	546
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	547 // Display (if @insert true) or remove the appropriate symbol for a breakpoint
65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	548 // in @file at @line with condition @cond.
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	549 void
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	550 octave_qt_link::do_update_breakpoint (bool insert,
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	551 const std::string& file, int line,
65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	552 const std::string& cond)
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	553 {
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	554 emit update_breakpoint_marker_signal (insert, QString::fromStdString (file),
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	555 line, QString::fromStdString (cond));
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	556 }
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	557
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	558 void
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	559 octave_qt_link::do_set_default_prompts (std::string& ps1, std::string& ps2,
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	560 std::string& ps4)
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	561 {
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	562 ps1 = ">> ";
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	563 ps2 = "";
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	564 ps4 = "";
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	565 }
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	566
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	567
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	568 void
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	569 octave_qt_link::do_insert_debugger_pointer (const std::string& file, int line)
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	570 {
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	571 emit insert_debugger_pointer_signal (QString::fromStdString (file), line);
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	572 }
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	573
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	574 void
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 octave_qt_link::do_delete_debugger_pointer (const std::string& file, int line)
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	576 {
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	577 emit delete_debugger_pointer_signal (QString::fromStdString (file), line);
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	578 }
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	579
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	580
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	581 bool
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	582 octave_qt_link::file_in_path (const std::string& file, const std::string& dir)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	583 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	584
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	585 bool ok = false;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	586 bool addpath_option = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	587
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	588 std::string curr_dir = octave_env::get_current_directory ();
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	589
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	590 if (same_file (curr_dir, dir))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	591 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	592 else
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	593 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	594 bool dir_in_load_path = load_path::contains_canonical (dir);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	595
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	596 std::string base_file = octave_env::base_pathname (file);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	597 std::string lp_file = load_path::find_file (base_file);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	598
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	599 if (dir_in_load_path)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	600 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	601 if (same_file (lp_file, file))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	602 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	603 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	604 else
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	605 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	606 // File directory is not in path. Is the file in the path in
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	607 // the current directory? If so, then changing the current
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	608 // directory will be needed. Adding directory to path is
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	609 // not enough because the file in the current directory would
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	610 // still be found.
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	611
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	612 if (same_file (lp_file, base_file))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	613 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	614 if (same_file (curr_dir, dir))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	615 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	616 else
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	617 addpath_option = false;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	618 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	619 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	620 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	621
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	622 if (! ok)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	623 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	624 int action = debug_cd_or_addpath_error (file, dir, addpath_option);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	625 switch (action)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	626 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	627 case 1:
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	628 Fcd (ovl (dir));
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	629 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	630 break;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	631
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	632 case 2:
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	633 load_path::prepend (dir);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	634 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	635 break;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	636
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	637 default:
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	638 break;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	639 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	640 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	641
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	642 return ok;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	643 }
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	644
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	645 void
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	646 octave_qt_link::do_show_preferences ()
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	647 {
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	648 emit show_preferences_signal ();
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	649 }
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	650
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	651 void
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	652 octave_qt_link::do_show_doc (const std::string& file)
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	653 {
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	654 emit show_doc_signal (QString::fromStdString (file));
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	655 }
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	656
17920 5c3f22dd0bbb raise SIGINT in octave_interpreter instead of in QTerminal John W. Eaton <jwe@octave.org> parents: 17919 diff changeset	657 void
5c3f22dd0bbb raise SIGINT in octave_interpreter instead of in QTerminal John W. Eaton <jwe@octave.org> parents: 17919 diff changeset	658 octave_qt_link::terminal_interrupt (void)
5c3f22dd0bbb raise SIGINT in octave_interpreter instead of in QTerminal John W. Eaton <jwe@octave.org> parents: 17919 diff changeset	659 {
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17920 diff changeset	660 command_interpreter->interrupt ();
17920 5c3f22dd0bbb raise SIGINT in octave_interpreter instead of in QTerminal John W. Eaton <jwe@octave.org> parents: 17919 diff changeset	661 }

Mercurial > octave

annotate libgui/src/octave-qt-link.cc @ 21311:718332a58d35