diff libgui/src/workspace-view.h @ 16477:64727ed135cb

use QTableView instead of QTreeView to display workspace * libgui/src/workspace-model.cc, libgui/src/workspace-model.h (workspace_model::workspace_model): Change to subclass QTreeView, using _columnNames for columns. (workspace_model::~workspace_model): Don't delete rootItem. (workspace_model::index): Delete. (workspace_model::parent): Delete. (workspace_model::rowCount): Return _symbols.size (workspace_model::columnCount): Return _columnNames.size. (workspace_model::insert_top_level_item): Delete. (workspace_model::top_level_item): Delete. (workspace_model::headerData): Return _columnNames. (workspace_model::data): Return data from string lists values. (workspace_model::set_workspace): Call update_table. (workspace_model::clear_workspace): Call update_table. (workspace_model::update_table): Rename from workspace_model::update_tree. (workspace_model::append_tree): Delete. * libgui/src/workspace-model.h (tree_item): Delete class decl. * libgui/src/workspace-view.h, libgui/src/workspace-view.cc (workspace_view::workspace_view): Use QTableView instead of QTreeView. (workspace_view::_explicit_collapse): Delete. (workspace_view::~workspace_view): Don't save _explicit_collapse settings. (workspace_view::model_changed): Delete. (workspace_view::collapse_requested): Delete. (workspace_view::expand_requested): Delete. (workspace_view::relay_contextmenu_command): Get cell 0 of the row. (workspace_view::contextmenu_requested): Get cell 0 of the row.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 09 Apr 2013 03:26:11 -0400
parents 8e2a853cdd7d
children 079ec7ce60e0
line wrap: on
line diff
--- a/libgui/src/workspace-view.h
+++ b/libgui/src/workspace-view.h
@@ -24,7 +24,7 @@
 #if !defined (workspace_view_h)
 #define workspace_view_h 1
 
-#include <QTreeView>
+#include <QTableView>
 #include <QSemaphore>
 
 #include "octave-dock-widget.h"
@@ -44,9 +44,6 @@
 
   void setModel (workspace_model *model) { view->setModel (model); }
 
-public slots:
-
-  void model_changed (void);
 
 signals:
 
@@ -59,8 +56,6 @@
 
 protected slots:
 
-  void collapse_requested (QModelIndex index);
-  void expand_requested (QModelIndex index);
   void item_double_clicked (QModelIndex index);
   void contextmenu_requested (const QPoint& pos);
 
@@ -73,14 +68,7 @@
 
   void relay_contextmenu_command (const QString& cmdname);
 
-  QTreeView *view;
-
-  struct
-  {
-    bool local;
-    bool global;
-    bool persistent;
-  } _explicit_collapse;
+  QTableView * view;
 };
 
 #endif