Mercurial > octave-nkf
view libgui/src/history-dock-widget.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 | 094bd3627ead |
children | d749c9b588e5 |
line wrap: on
line source
/* Copyright (C) 2011-2012 Jacob Dawid This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <QApplication> #include <QClipboard> #include <QVBoxLayout> #include <QMenu> #include "error.h" #include "cmd-hist.h" #include "history-dock-widget.h" history_dock_widget::history_dock_widget (QWidget *p) : octave_dock_widget (p) { setObjectName ("HistoryDockWidget"); setStatusTip (tr ("Browse and search the command history.")); connect (this, SIGNAL (command_create_script (const QString&)), p, SLOT (new_file (const QString&))); connect (this, SIGNAL (information (const QString&)), p, SLOT (report_status_message (const QString&))); connect (this, SIGNAL (command_double_clicked (const QString&)), p, SLOT (execute_command_in_terminal (const QString&))); construct (); } void history_dock_widget::construct () { _history_model = new QStringListModel (); _sort_filter_proxy_model.setSourceModel (_history_model); _history_list_view = new QListView (this); _history_list_view->setModel (&_sort_filter_proxy_model); _history_list_view->setAlternatingRowColors (true); _history_list_view->setEditTriggers (QAbstractItemView::NoEditTriggers); _history_list_view->setStatusTip (tr ("Doubleclick a command to transfer it to the terminal.")); _history_list_view->setSelectionMode (QAbstractItemView::ExtendedSelection); _history_list_view->setContextMenuPolicy(Qt::CustomContextMenu); connect(_history_list_view, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(ctxMenu(const QPoint &))); _filter_line_edit = new QLineEdit (this); _filter_line_edit->setStatusTip (tr ("Enter text to filter the command history.")); QVBoxLayout *vbox_layout = new QVBoxLayout (); setWindowIcon (QIcon(":/actions/icons/logo.png")); setWindowTitle (tr ("Command History")); setWidget (new QWidget ()); vbox_layout->addWidget (_history_list_view); vbox_layout->addWidget (_filter_line_edit); vbox_layout->setMargin (2); widget ()->setLayout (vbox_layout); connect (_filter_line_edit, SIGNAL (textEdited (QString)), &_sort_filter_proxy_model, SLOT (setFilterWildcard (QString))); connect (_history_list_view, SIGNAL (doubleClicked (QModelIndex)), this, SLOT (handle_double_click (QModelIndex))); setFocusProxy (_filter_line_edit); } void history_dock_widget::ctxMenu(const QPoint &xpos) { QMenu menu(this); menu.addAction(tr("Copy"), this, SLOT(handle_contextmenu_copy(bool))); menu.addAction(tr("Evaluate"), this, SLOT(handle_contextmenu_evaluate(bool))); menu.addAction(tr("Create script"), this, SLOT(handle_contextmenu_create_script(bool))); menu.exec(_history_list_view->mapToGlobal(xpos)); } void history_dock_widget::handle_contextmenu_copy(bool) { QString text; QItemSelectionModel *selectionModel = _history_list_view->selectionModel(); QModelIndexList rows = selectionModel->selectedRows(); QModelIndexList::iterator it; for (it=rows.begin() ; it != rows.end(); it++) { if ((*it).isValid()) { text += (*it).data().toString()+"\n"; } } QApplication::clipboard()->setText(text); } void history_dock_widget::handle_contextmenu_evaluate(bool) { QItemSelectionModel *selectionModel = _history_list_view->selectionModel(); QModelIndexList rows = selectionModel->selectedRows(); QModelIndexList::iterator it; for (it=rows.begin() ; it != rows.end(); it++) { if ((*it).isValid()) { emit command_double_clicked ((*it).data().toString()+"\n"); } } } void history_dock_widget::handle_contextmenu_create_script (bool) { QString text; QItemSelectionModel *selectionModel = _history_list_view->selectionModel (); QModelIndexList rows = selectionModel->selectedRows (); for (QModelIndexList::iterator it = rows.begin (); it != rows.end (); it++) { if ((*it).isValid ()) text += (*it).data().toString() + "\n"; } if (text.length () > 0) emit command_create_script (text); } void history_dock_widget::handle_double_click (QModelIndex modelIndex) { emit command_double_clicked (modelIndex.data().toString()+"\n"); } void history_dock_widget::set_history (const QStringList& hist) { _history_model->setStringList (hist); _history_list_view->scrollToBottom (); } void history_dock_widget::append_history (const QString& hist_entry) { QStringList lst = _history_model->stringList (); lst.append (hist_entry); _history_model->setStringList (lst); _history_list_view->scrollToBottom (); } void history_dock_widget::clear_history (void) { _history_model->setStringList (QStringList ()); }