Mercurial > octave-nkf
view libgui/src/history-dockwidget.cc @ 16350:d4b6ad43bc87
use direct callbacks instead to handle history and workspace list updates
* history-docwidget.h, history-dockwidget.cc
(history_dock_widget::_update_event_enabled): Delete data member and
all uses.
* history-dockwidget.cc (history_dock_widget::construct):
Don't install a timer.
(history_dock_widget::update_history_callback): Now public.
* workspace-model.cc (workspace_model::workspace_model): Don't install
a timer.
(workspace_model::_update_event_enabled): Delete data member and all uses.
(workspace_model::update_workspace_callback): Now public.
* workspace-view (workspace_view::model_changed): call
workspace_model::update_workspace_callback.
* main-window.h, main-window.cc (main_window::update_workspace,
main_window::update_history): New functions.
(main_window::construct): Connect them to corresponding signals.
* octave-event-listener.h (octave_event_listener::update_workspace,
octave_event_listener::update_history): New virtual functions.
* octave-link.h, octave-link.cc (octave_link::update_workspace,
octave_link::update_history, octave_link::do_update_workspace,
octave_link::do_update_history,
octave_link::post_input_event_hook_fcn,
octave_link::do_post_input_event_hook_fcn): New functions.
* octave-main-thread.cc (pre_input_event_hook_fcn,
post_input_event_hook_fcn): New functions.
(octave_main_thread::run): Install pre- and post- input event callback
functions.
* octave-qt-event-listener.h, octave-qt-event-listener.cc
(octave_qt_event_listener::update_workspace
octave_qt_event_listener::update_history): New functions.
(octave_qt_event_listener::update_workspace_signal,
octave_qt_event_listener::update_history_signal): New signals.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 21 Mar 2013 02:28:48 -0400 |
parents | 0486a29d780f |
children | d8babb249f65 |
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-dockwidget.h" #include "octave-link.h" history_dock_widget::history_dock_widget (QWidget * p) : octave_dock_widget (p) { setObjectName ("HistoryDockWidget"); 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 = new QMenu; menu->addAction(tr("Copy"), this, SLOT(handle_contextmenu_copy(bool))); menu->addAction(tr("Evaluate"), this, SLOT(handle_contextmenu_evaluate(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_double_click (QModelIndex modelIndex) { emit command_double_clicked (modelIndex.data().toString()+"\n"); } void history_dock_widget::request_history_model_update () { octave_link::post_event (this, &history_dock_widget::update_history_callback); } void history_dock_widget::reset_model () { _history_model->setStringList (QStringList ()); } void history_dock_widget::update_history_callback (void) { static bool scroll_window = false; // Determine the client's (our) history length and the one of the server. int clientHistoryLength = _history_model->rowCount (); int serverHistoryLength = command_history::length (); // If were behind the server, iterate through all new entries and add // them to our history. if (clientHistoryLength < serverHistoryLength) { int elts_to_add = serverHistoryLength - clientHistoryLength; _history_model->insertRows (clientHistoryLength, elts_to_add); for (int i = clientHistoryLength; i < serverHistoryLength; i++) { std::string entry = command_history::get_entry (i); _history_model->setData (_history_model->index (i), QString::fromUtf8 (entry.data (), entry.size ())); } // FIXME -- does this behavior make sense? Calling // _history_list_view->scrollToBottom () here doesn't seem to // have any effect. Instead, we need to request that action // and wait until the next event occurs in which no items // are added to the history list. scroll_window = true; } else if (scroll_window) { scroll_window = false; _history_list_view->scrollToBottom (); } }