octave-nkf: libgui/src/welcome-wizard.cc annotate

annotate libgui/src/welcome-wizard.cc @ 16570:d5ae5aa80d42

preserve pending command line input when running commands from GUI actions * QTerminal.h, QTerminal.cc (QTerminal::relay_command): Delete. * file-editor-tab.cc (file_editor_tab::run_file_callback): New argument, bp_info. Save pending command line input and execute command. (file_editor_tab::run_file): Use octave_link to execute file. * main-window.h, main-window.cc (main_window::execute_command_in_terminal): Rename from main_window::handle_command_double_clicked. Post event through octave_link to execute command. (main_window::construct_octave_qt_link): Connect _octave_qt_link::execute_command_in_terminal_signal to main_window::execute_command_in_terminal. (main_window::execute_command_callback): New function. (main_window::relay_command_signal): Delete signal. Remove all uses. * octave-qt-link.h, octave-qt-link.cc (octave_qt_link::do_execute_command_in_terminal): New function. (octave_qt_link::execute_command_in_terminal_signal): New signal. * terminal-dock-widget.h, terminal-dock-widget.cc (terminal_dock_widget::relay_command_signal): Delete signal. Remove all uses. * octave-link.h (octave_link::execute_command_in_terminal, octave_link::do_execute_command_in_terminal): New functions. * cmd-edit.h, cmd-edit.cc (command_editor::pre_input_hook_set): New variable. (gnu_readline::previous_pre_input_hook, command_editor::intial_input): New member variables. (command_editor::restore_pre_input_hook, command_editor::do_get_current_line, command_editor::do_replace_line, command_editor::set_pre_input_hook, gnu_readline::do_get_current_line, gnu_readline::do_replace_line, gnu_readline::set_pre_input_hook, command_editor::set_initial_input, gnu_readline::restore_pre_input_hook, default_command_editor::do_get_current_line, default_command_editor::do_replace_line, command_editor::insert_initial_input, command_editor::pre_input_handler, command_editor::get_current_line, command_editor::replace_line, command_editor::add_pre_input_hook, command_editor::do_insert_initial_input, command_editor::set_pre_input_hook, command_editor::restore_pre_input_hook): New functions. (command_editor::readline): Handle initial input. (command_editor::interrupt): Give argument a default value. * oct-rl-edit.h, oct-rl-edit.c (octave_rl_copy_line, octave_rl_replace_line, octave_rl_set_pre_input_hook, octave_rl_get_pre_input_hook): New functions. (rl_pre_input_hook_fcn_ptr): New typedef.

author	John W. Eaton <jwe@octave.org>
date	Thu, 25 Apr 2013 17:57:55 -0400
parents	36ececf69385
children	c8c0dff02538

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	3 Copyright (C) 2011-2012 Jacob Dawid
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 for more details.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 along with Octave; see the file COPYING. If not, see
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21 */
13674 c0e66d6e3dc8 Updated license headers and moved to AGPLv3. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13668 diff changeset	22
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	23 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	24 #include <config.h>
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	25 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	26
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	27 #include "welcome-wizard.h"
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 14712 diff changeset	28 #include "ui-welcome-wizard.h"
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	30 welcome_wizard::welcome_wizard (QWidget *p)
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	31 : QDialog (p), _ui (new Ui::welcome_wizard)
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	33 _ui->setupUi (this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	34 connect (_ui->nextButton1, SIGNAL (clicked ()), this, SLOT (next ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	35 connect (_ui->nextButton2, SIGNAL (clicked ()), this, SLOT (next ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	36 connect (_ui->nextButton3, SIGNAL (clicked ()), this, SLOT (next ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	37 connect (_ui->nextButton4, SIGNAL (clicked ()), this, SLOT (next ()));
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	38
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	39 connect (_ui->previousButton2, SIGNAL (clicked ()), this, SLOT (previous ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	40 connect (_ui->previousButton3, SIGNAL (clicked ()), this, SLOT (previous ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	41 connect (_ui->previousButton4, SIGNAL (clicked ()), this, SLOT (previous ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	42 connect (_ui->previousButton5, SIGNAL (clicked ()), this, SLOT (previous ()));
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	43 }
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	44
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	45 welcome_wizard::~welcome_wizard()
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	46 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	47 delete _ui;
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	48 }
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	49
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	50 void
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	51 welcome_wizard::next ()
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	52 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	53 _ui->stackedWidget->setCurrentIndex (_ui->stackedWidget->currentIndex () + 1);
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	54 }
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	55
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	56 void
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	57 welcome_wizard::previous ()
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	58 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	59 _ui->stackedWidget->setCurrentIndex (_ui->stackedWidget->currentIndex () - 1);
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	60 }
421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	61

Mercurial > hg > octave-nkf

annotate libgui/src/welcome-wizard.cc @ 16570:d5ae5aa80d42