Mercurial > octave
diff libgui/src/main-window.cc @ 16502:45ae1038ee89
allow renaming of variables in workspace viewer
* main-window.h, main-window.cc
(main_window::handle_rename_variable_request): New function.
(main_window::construct_octave_qt_link): Connect
_workspace_model::rename_variable to
main_window::handle_rename_variable_request.
(main_window::rename_variable_callback): New function.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::do_set_workspace,
octave_qt_link::set_workspace_signal): New argument, top_level.
Change all uses.
* octave-link.h, octave-link.cc (octave_link::post_event):
Provide two-argument version.
(octave_link::set_workspace, octave_link::do_set_workspace):
New argument, top_level. Change all uses.
* workspace-model.h, workspace-model.cc (workspace_model::flags):
Conditionally add Qt::ItemIsEditable to flags.
(workspace_model::data): Also return value for column 0 if it is
editable.
(workspace_model::setData): Handle setting new values.
(workspace_model::_top_level): New data member.
(workspace_model::set_workspace): New argument, top_level.
(workspace_model::rename_variable): New signal.
* workspace-view.h, workspace-view.cc (variable_name_editor):
New class.
(workspace_view::var_name_editor): New data member.
(workspace_view::workspace_view): Initialize it. Set var_name_editor
as delegate for column 0.
(workspace_view::~workspace_view): Delete var_name_editor.
(workspace_view::item_double_clicked): Delete.
* symtab.h (symbol_table::rename, symbol_table::do_rename,
symbol_table::symbol_record::rename): New functions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 12 Apr 2013 14:50:56 -0400 |
| parents | facf00ce97d3 |
| children | 49b059bf27c7 |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Fri Apr 12 19:10:32 2013 +0200 +++ b/libgui/src/main-window.cc Fri Apr 12 14:50:56 2013 -0400 @@ -39,6 +39,8 @@ #include <QMessageBox> #include <QIcon> +#include <utility> + #ifdef HAVE_QSCINTILLA #include "file-editor.h" #endif @@ -49,6 +51,7 @@ #include "builtin-defun-decls.h" #include "defaults.h" +#include "symtab.h" #include "version.h" static file_editor_interface * @@ -148,6 +151,17 @@ } void +main_window::handle_rename_variable_request (const QString& old_name, + const QString& new_name) + +{ + name_pair names (old_name.toStdString (), new_name.toStdString ()); + + octave_link::post_event (this, &main_window::rename_variable_callback, + names); +} + +void main_window::handle_clear_history_request (void) { octave_link::post_event (this, &main_window::clear_history_callback); @@ -598,12 +612,14 @@ connect (_octave_qt_link, SIGNAL (set_workspace_signal - (const QString&, const QStringList&, const QStringList&, - const QStringList&, const QStringList&)), + (bool, const QString&, const QStringList&, + const QStringList&, const QStringList&, + const QStringList&)), _workspace_model, SLOT (set_workspace - (const QString&, const QStringList&,const QStringList&, - const QStringList&, const QStringList&))); + (bool, const QString&, const QStringList&, + const QStringList&, const QStringList&, + const QStringList&))); connect (_octave_qt_link, SIGNAL (clear_workspace_signal ()), _workspace_model, SLOT (clear_workspace ())); @@ -649,6 +665,12 @@ editor_window, SLOT (handle_delete_debugger_pointer_request (const QString&, int))); + connect (_workspace_model, + SIGNAL (rename_variable (const QString&, const QString&)), + this, + SLOT (handle_rename_variable_request (const QString&, + const QString&))); + _octave_qt_link->execute_interpreter (); octave_link::connect_link (_octave_qt_link); @@ -1184,6 +1206,18 @@ } void +main_window::rename_variable_callback (const main_window::name_pair& names) +{ + /* bool status = */ symbol_table::rename (names.first, names.second); + + // if (status) + octave_link::set_workspace (true, symbol_table::workspace_info ()); + + // else + // ; // we need an octave_link action that runs a GUI error option. +} + +void main_window::clear_history_callback (void) { Fhistory (ovl ("-c"));