Mercurial > octave-nkf
changeset 16444:6cd66a5a76e8
undo unintended changes in changeset 302157614308
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 06 Apr 2013 14:01:58 -0400 |
| parents | 7a2ee6ea7800 |
| children | 3f8d3fc907af |
| files | libgui/src/workspace-model.cc libgui/src/workspace-model.h libgui/src/workspace-view.cc |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/workspace-model.cc Sat Apr 06 13:06:40 2013 -0400 +++ b/libgui/src/workspace-model.cc Sat Apr 06 14:01:58 2013 -0400 @@ -56,6 +56,7 @@ void workspace_model::request_update_workspace () { + octave_link::post_event (this, &workspace_model::update_workspace_callback); } QModelIndex @@ -167,7 +168,6 @@ return item->data(idx.column()); } -#if 0 void workspace_model::update_workspace_callback (void) { @@ -213,4 +213,3 @@ endResetModel(); } -#endif
--- a/libgui/src/workspace-model.h Sat Apr 06 13:06:40 2013 -0400 +++ b/libgui/src/workspace-model.h Sat Apr 06 14:01:58 2013 -0400 @@ -131,6 +131,8 @@ void insert_top_level_item (int at, tree_item *treeItem); tree_item *top_level_item (int at); + void update_workspace_callback (void); + public slots: void request_update_workspace ();
--- a/libgui/src/workspace-view.cc Sat Apr 06 13:06:40 2013 -0400 +++ b/libgui/src/workspace-view.cc Sat Apr 06 14:01:58 2013 -0400 @@ -114,6 +114,8 @@ void workspace_view::model_changed () { + _workspace_model->update_workspace_callback (); + // This code is very quirky and requires some explanation. // Usually, we should not deal with collapsing or expanding ourselves, // because the view itself determines (based on the model) whether it