change things so we focus the cell and select the row, and also dispatch

2000-06-10  Chris Toshok  <toshok@helixcode.com>

	* e-table-item.c (eti_event): change things so we focus the cell
	and select the row, and also dispatch the event to that row/cell.
	This fixes the problem with the tree where you had to click twice
	to activate the tree controls.

	* Makefile.am (libetable_a_SOURCES): remove e-tree-gnode.* and add
	e-tree-simple.*
	(icons): add tree-expanded.xpm and tree-unexpanded.xpm

	* e-cell-tree.c (ect_enter_edit): defer to subcell's view.
	(ect_leave_edit): defer to subcell's view.
	(visible_depth_of_node): visual depth, taking into account that
	the root node of the model might not be displayed.
	(offset_of_node): return the offset used to shift the subcell
	over.
	(ect_draw): don't draw vertical lines if we're the leftmode node
	(a visual root node).  also, don't shift x2 by the subcell offset,
	so we get ellipses like we're supposed to.
	(ect_event): remove GDK_BUTTON_RELEASE from the list of events
	that we care about.

	* e-tree-example-1.c: lots of changes, a more dynamic UI so we can
	test tree model api stuff.

	* e-tree-gnode.c, e-tree-gnode.c: removed files, since their guts
	have been rolled into e-tree-model.c

	* e-tree-model.c, e-tree-model.h: substantially changed.  too much
	to really describe here.  this should really be considered the
	first revision of these files :)

	* e-tree-simple.c, e-tree-simple.h: analogous to e-table-simple, a
	subclass that allows the use of function pointers.

svn path=/trunk/; revision=3519

1 files changed, 56 insertions, 27 deletions

diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index 6924f3ea0e..45351b8f6c 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -10,18 +10,13 @@
 #define E_IS_TREE_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TREE_MODEL_TYPE))
 #define E_IS_TREE_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_MODEL_TYPE))
 
-typedef gpointer ETreePathItem;
-typedef GList ETreePath;
+typedef GNode ETreePath;
 
 typedef struct {
 	ETableModel base;
-
-	ETableModel *source;
-
-	ETreePath *root_node;
-
-	GArray  *array;
-
+	GNode      *root;
+	gboolean   root_visible;
+	GArray     *row_array; /* used in the mapping between ETable and our tree */
 } ETreeModel;
 
 typedef struct {
@@ -32,41 +27,75 @@ typedef struct {
 	 */
 	ETreePath *(*get_root)      (ETreeModel *etm);
 
+	ETreePath *(*get_parent)    (ETreeModel *etm, ETreePath* node);
 	ETreePath *(*get_next)      (ETreeModel *etm, ETreePath* node);
 	ETreePath *(*get_prev)      (ETreeModel *etm, ETreePath* node);
+	guint      (*get_children)         (ETreeModel *etm, ETreePath* node, ETreePath ***paths);
+
+	gboolean   (*is_expanded)          (ETreeModel *etm, ETreePath* node);
+	gboolean   (*is_visible)           (ETreeModel *etm, ETreePath* node);
+	void       (*set_expanded)         (ETreeModel *etm, ETreePath* node, gboolean expanded);
+	void       (*set_expanded_recurse) (ETreeModel *etm, ETreePath *node, gboolean expanded);
+	void       (*set_expanded_level)   (ETreeModel *etm, ETreePath *node, gboolean expanded, int level);
 
+	ETreePath* (*node_at_row)          (ETreeModel *etm, int row);
+
+	/*
+	 * ETable analogs
+	 */
 	void      *(*value_at)      (ETreeModel *etm, ETreePath* node, int col);
 	void       (*set_value_at)  (ETreeModel *etm, ETreePath* node, int col, const void *val);
 	gboolean   (*is_editable)   (ETreeModel *etm, ETreePath* node, int col);
 
-	guint      (*get_children)  (ETreeModel *etm, ETreePath* node, ETreePath ***paths);
-	void       (*release_paths) (ETreeModel *etm, ETreePath **paths, guint num_paths);
-	gboolean   (*is_expanded)   (ETreeModel *etm, ETreePath* node);
-	void       (*set_expanded)  (ETreeModel *etm, ETreePath* node, gboolean expanded);
 
 	/*
 	 * Signals
 	 */
+	void       (*node_changed)  (ETreeModel *etm, ETreePath *node);
+	void       (*node_inserted) (ETreeModel *etm, ETreePath *parent, ETreePath *inserted_node);
+	void       (*node_removed)  (ETreeModel *etm, ETreePath *parent, ETreePath *removed_node);
 
 } ETreeModelClass;
 
 GtkType     e_tree_model_get_type (void);
-
+void        e_tree_model_construct (ETreeModel *etree);
 ETreeModel *e_tree_model_new (void);
 
-/* operations on "nodes" in the tree */
-ETreePath * e_tree_model_get_root (ETreeModel *etree);
-ETreePath * e_tree_model_node_at_row (ETreeModel *etree, int row);
-guint e_tree_model_node_depth (ETreeModel *etree, ETreePath *path);
+/* tree traversal operations */
+ETreePath *e_tree_model_get_root        (ETreeModel *etree);
 ETreePath *e_tree_model_node_get_parent (ETreeModel *etree, ETreePath *path);
-ETreePath *e_tree_model_node_get_next (ETreeModel *etree, ETreePath *path);
-ETreePath *e_tree_model_node_get_prev (ETreeModel *etree, ETreePath *path);
-gboolean e_tree_model_node_is_root (ETreeModel *etree, ETreePath *path);
-
-gboolean e_tree_model_node_is_expandable (ETreeModel *etree, ETreePath *path);
-gboolean e_tree_model_node_is_expanded (ETreeModel *etree, ETreePath *path);
-guint e_tree_model_node_get_children (ETreeModel *etree, ETreePath *path, ETreePath ***paths);
-void e_tree_model_release_paths (ETreeModel *etree, ETreePath **paths, guint num_paths);
-guint e_tree_model_node_num_visible_descendents (ETreeModel *etm, ETreePath *node);
+ETreePath *e_tree_model_node_get_next   (ETreeModel *etree, ETreePath *path);
+ETreePath *e_tree_model_node_get_prev   (ETreeModel *etree, ETreePath *path);
+
+/* node operations */
+ETreePath *e_tree_model_node_insert        (ETreeModel *etree, ETreePath *parent, int position, gpointer node_data);
+ETreePath *e_tree_model_node_insert_before (ETreeModel *etree, ETreePath *parent, ETreePath *sibling, gpointer node_data);
+gpointer   e_tree_model_node_remove        (ETreeModel *etree, ETreePath *path);
+
+/* node accessors */
+gboolean e_tree_model_node_is_root                 (ETreeModel *etree, ETreePath *path);
+gboolean e_tree_model_node_is_expandable           (ETreeModel *etree, ETreePath *path);
+gboolean e_tree_model_node_is_expanded             (ETreeModel *etree, ETreePath *path);
+gboolean e_tree_model_node_is_visible              (ETreeModel *etree, ETreePath *path);
+void     e_tree_model_node_set_expanded            (ETreeModel *etree, ETreePath *path, gboolean expanded);
+void     e_tree_model_node_set_expanded_recurse    (ETreeModel *etree, ETreePath *path, gboolean expanded);
+guint    e_tree_model_node_get_children            (ETreeModel *etree, ETreePath *path, ETreePath ***paths);
+guint    e_tree_model_node_depth                   (ETreeModel *etree, ETreePath *path);
+guint    e_tree_model_node_num_visible_descendents (ETreeModel *etm, ETreePath *node);
+gpointer e_tree_model_node_get_data                (ETreeModel *etm, ETreePath *node);
+void     e_tree_model_node_set_data                (ETreeModel *etm, ETreePath *node, gpointer node_data);
+
+/* display oriented routines */
+ETreePath *e_tree_model_node_at_row           (ETreeModel *etree, int row);
+int        e_tree_model_row_of_node           (ETreeModel *etree, ETreePath *path);
+void       e_tree_model_root_node_set_visible (ETreeModel *etree, gboolean visible);
+gboolean   e_tree_model_root_node_is_visible  (ETreeModel *etree);
+
+/*
+** Routines for emitting signals on the ETreeModel
+*/
+void  e_tree_model_node_changed  (ETreeModel *tree_model, ETreePath *node);
+void  e_tree_model_node_inserted (ETreeModel *tree_model, ETreePath *parent_node, ETreePath *inserted_node);
+void  e_tree_model_node_removed  (ETreeModel *tree_model, ETreePath *parent_node, ETreePath *removed_node);
 
 #endif /* _E_TREE_MODEL_H */