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

annotate libgui/src/octave-qt-link.cc @ 17884:766ad9be2966

Prompt for non-existent new file when using edit.m from GUI (bug #40450) * libgui/src/octave-qt-link.cc(do_prompt_new_edit_file): New function to display question dialog. * libgui/src/octave-qt-link.h(do_prompt_new_edit_file): Add function to header file. * libinterp/corefcn/octave-link.cc(__octave_link_edit_file__): If 2nd argument present, display prompt dialog. * libinterp/corefcn/octave-link.h(prompt_new_edit_file): If octave-link enabled, use prompt dialog box. * scripts/miscellaneous/edit.m: Modify to use new prompt routine. CLI behavior is unchanged.

author	Torsten <ttl@justmail.de>
date	Fri, 08 Nov 2013 07:40:36 -0800
parents	86e8dbccf7c7
children	a38cee8f0a9b

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
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	3 Copyright (C) 2013 John W. Eaton
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17029 diff changeset	4 Copyright (C) 2011-2013 Jacob Dawid
d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17029 diff changeset	5 Copyright (C) 2011-2013 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
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	26 #include <config.h>
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>
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	32
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	33 #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	34 #include "dialog.h"
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	35 #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	36 #include "workspace-element.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	37 #include "builtin-defun-decls.h"
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	38 #include "load-path.h"
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	39 #include "oct-env.h"
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	40 #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	41
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	42 #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	43
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	44 #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	45
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	46 octave_qt_link::octave_qt_link (octave_main_thread *mt)
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	47 : octave_link (), main_thread (mt)
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	48 { }
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	49
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	50 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	51
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	52 void
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	53 octave_qt_link::execute_interpreter (void)
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	54 {
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	55 main_thread->execute_interpreter ();
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	56 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	57
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	58 bool
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	59 octave_qt_link::do_exit (int status)
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	60 {
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	61 emit exit_signal (status);
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	62
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	63 return true;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	64 }
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	65
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16479 diff changeset	66 bool
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	67 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	68 {
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	69 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	70
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	71 return true;
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	72 }
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	73
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	74 bool
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	75 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	76 {
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	77 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	78
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	79 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	80 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	81
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	82 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	83 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	84 QStringList role;
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	85 role << "AcceptRole" << "AcceptRole";
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	86 btn << tr ("Yes") << tr ("No");
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	87
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	88 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	89 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	90 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	91 + 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	92 tr ("Octave Editor"), "quest", btn, tr ("Yes"), role );
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	93
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	94 // Wait while the user is responding to message box.
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	95 uiwidget_creator.wait ();
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	96 // The GUI has sent a signal and the process has been awakened.
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	97 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	98
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	99 return (answer == tr ("Yes"));
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	100 }
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	101
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	102 int
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	103 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	104 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	105 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	106 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	107 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	108 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	109 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	110 QStringList (), QString (),
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	111 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	112
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	113 // Wait while the user is responding to message box.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	114 uiwidget_creator.wait ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	115
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	116 // The GUI has sent a signal and the process has been awakened.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	117 return 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	118 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	119
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	120 std::string
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	121 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	122 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	123 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	124 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	125 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	126 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	127 {
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	128 QStringList btn;
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	129 QStringList role;
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	130 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	131 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	132 if (btn2 == "")
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	133 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	134 else
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	135 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	136 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	137
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	138 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	139 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	140 "quest",
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	141 btn,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	142 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	143 role);
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	144
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	145 // Wait while the user is responding to message box.
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	146 uiwidget_creator.wait ();
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	147
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	148 // The GUI has sent a signal and the process has been awakened.
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	149 return uiwidget_creator.get_dialog_button ().toStdString ();
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	150 }
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	151
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	152 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	153 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	154 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	155 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	156
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	157 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	158 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	159 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	160 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	161 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	162
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	163 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	164 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	165
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	166 static QStringList
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	167 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	168 {
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	169 QStringList retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	170
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	171 // 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	172 // 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	173 // (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	174 // 'FilterName (space separated exts)'.
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	175
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	176 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	177 it != lst.end (); it++)
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	178 {
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	179 QString ext = QString::fromStdString (it->first);
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	180 QString name = QString::fromStdString (it->second);
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	181
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	182 // 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	183 // list.
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	184
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	185 name.replace (QRegExp ("\\(.*\\)"), "");
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	186 ext.replace (";", " ");
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	187
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	188 if (name.length () == 0)
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	189 {
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	190 // 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	191 name = ext.toUpper () + " Files";
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	192 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	193
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	194 retval.append (name + " (" + ext + ")");
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	195 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	196
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	197 return retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	198 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	199
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	200 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	201 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	202 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	203 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	204 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	205 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	206 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	207 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	208 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	209 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	210 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	211 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	212 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	213 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	214 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	215 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	216 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	217 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	218
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	219 // Wait while the user is responding to message box.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	220 uiwidget_creator.wait ();
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 // The GUI has sent a signal and the process has been awakened.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	223 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	224 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	225
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	226 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	227 }
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 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	230 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	231 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	232 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	233 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	234 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	235 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	236 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	237
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	238 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	239 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	240 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	241 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	242 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	243
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	244 // Wait while the user is responding to message box.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	245 uiwidget_creator.wait ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	246
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	247 // The GUI has sent a signal and the process has been awakened.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	248 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	249
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	250 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	251 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	252 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	253 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	254 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	255
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	256 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	257 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	258
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	259 std::list<std::string>
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	260 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	261 const std::string& title,
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	262 const std::string& filename,
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	263 const std::string& dirname,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	264 const std::string& multimode)
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	265 {
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	266 std::list<std::string> retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	267
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	268 uiwidget_creator.signal_filedialog (make_filter_list (filter),
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	269 QString::fromStdString (title),
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	270 QString::fromStdString (filename),
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	271 QString::fromStdString (dirname),
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	272 QString::fromStdString (multimode));
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	273
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	274 // Wait while the user is responding to dialog.
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	275 uiwidget_creator.wait ();
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	276
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	277 // 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	278 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	279
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	280 for (QStringList::const_iterator it = inputLine->begin ();
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	281 it != inputLine->end (); it++)
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	282 retval.push_back (it->toStdString ());
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	283
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	284 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	285 retval.push_back ((QString ("%1").arg (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	286 uiwidget_creator.get_dialog_result ())).toStdString ());
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	287
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	288 return retval;
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	289 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	290
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	291 int
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	292 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	293 const std::string& dir,
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	294 bool addpath_option)
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	295 {
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	296 int retval = -1;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	297
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	298 QString qdir = QString::fromStdString (dir);
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	299 QString qfile = QString::fromStdString (file);
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	300
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	301 QString msg
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	302 = (addpath_option
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	303 ? tr ("The file %1 does not exist in the load path. To 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)
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	304 : tr ("The file %1 is shadowed by a file with the same name in the load path. To 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	305
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	306 QString title = tr ("Change Directory or Add Directory to Load Path");
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	307
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	308 QString cd_txt = tr ("Change Directory");
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	309 QString addpath_txt = tr ("Add Directory to Load Path");
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	310 QString cancel_txt = tr ("Cancel");
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	311
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	312 QStringList btn;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	313 QStringList role;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	314 btn << cd_txt;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	315 role << "AcceptRole";
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	316 if (addpath_option)
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	317 {
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	318 btn << addpath_txt;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	319 role << "AcceptRole";
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	320 }
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	321 btn << cancel_txt;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	322 role << "AcceptRole";
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	323
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	324 uiwidget_creator.signal_dialog (msg, title, "quest", btn, cancel_txt, role);
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	325
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	326 // Wait while the user is responding to message box.
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	327 uiwidget_creator.wait ();
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	328
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	329 QString result = uiwidget_creator.get_dialog_button ();
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	330
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	331 if (result == cd_txt)
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	332 retval = 1;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	333 else if (result == addpath_txt)
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	334 retval = 2;
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	335
e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	336 return retval;
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	337 }
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	338
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	339 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	340 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	341 {
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	342 emit change_directory_signal (QString::fromStdString (dir));
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	343 }
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	344
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	345 void
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	346 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	347 {
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	348 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	349 }
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	350
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	351 void
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16485 diff changeset	352 octave_qt_link::do_set_workspace (bool top_level,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16485 diff changeset	353 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	354 {
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	355 QString scopes;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	356 QStringList symbols;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	357 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	358 QStringList dimensions;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	359 QStringList values;
17824 86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	360 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	361
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	362 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	363 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	364 {
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	365 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	366 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	367 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	368 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	369 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	370 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	371 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	372
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16485 diff changeset	373 emit set_workspace_signal (top_level, 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	374 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	375 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	376
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	377 void
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	378 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	379 {
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	380 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	381 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	382
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	383 void
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	384 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	385 {
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	386 QStringList qt_hist;
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	387
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	388 for (octave_idx_type i = 0; i < hist.length (); i++)
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	389 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	390
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	391 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	392 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	393
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	394 void
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	395 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	396 {
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	397 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	398 }
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	399
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	400 void
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	401 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	402 {
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	403 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	404 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	405
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	406 void
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	407 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	408 {
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	409 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	410
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	411 void
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	412 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	413 {
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	414 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	415
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	416 void
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	417 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	418 {
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	419 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	420
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	421 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	422 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	423
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	424 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	425 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	426 {
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	427 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	428 }
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	429
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	430 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	431 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	432 {
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	433 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	434 }
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	435
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	436 void
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	437 octave_qt_link::do_update_breakpoint (bool insert,
16419 16bfbf9136d3 avoid creating unnecessary octave_value objects for octave_link calls John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	438 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	439 {
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	440 emit update_breakpoint_marker_signal (insert, QString::fromStdString (file),
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	441 line);
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	442 }
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	443
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	444 void
16528 9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	445 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	446 std::string& ps4)
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	447 {
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	448 ps1 = ">> ";
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	449 ps2 = "";
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	450 ps4 = "";
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	451 }
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	452
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	453
9bc1f8278966 allow GUI to customize prompts at startup John W. Eaton <jwe@octave.org> parents: 16512 diff changeset	454 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	455 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	456 {
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	457 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	458 }
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	459
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	460 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	461 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	462 {
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	463 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	464 }
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	465
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	466
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	467 bool
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	468 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	469 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	470
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	471 bool ok = false;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	472 bool addpath_option = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	473
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	474 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	475
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	476 if (same_file (curr_dir, dir))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	477 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	478 else
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	479 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	480 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	481
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	482 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	483 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	484
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	485 if (dir_in_load_path)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	486 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	487 if (same_file (lp_file, file))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	488 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	489 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	490 else
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	491 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	492 // 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	493 // 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	494 // 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	495 // 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	496 // still be found.
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	497
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	498 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	499 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	500 if (same_file (curr_dir, dir))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	501 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	502 else
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	503 addpath_option = false;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	504 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	505 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	506 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	507
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	508 if (! ok)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	509 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	510 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	511 switch (action)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	512 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	513 case 1:
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	514 Fcd (ovl (dir));
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	515 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	516 break;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	517
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	518 case 2:
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	519 load_path::prepend (dir);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	520 ok = true;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	521 break;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	522
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	523 default:
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	524 break;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	525 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	526 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	527
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	528 return ok;
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	529 }
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	530
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	531 void
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	532 octave_qt_link::do_show_preferences ()
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	533 {
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	534 emit show_preferences_signal ();
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	535 }
c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	536
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	537 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	538 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	539 {
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	540 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	541 }
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	542
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	543

Mercurial > octave-nkf

annotate libgui/src/octave-qt-link.cc @ 17884:766ad9be2966