Add argument handling here.

2000-04-24  Miguel de Icaza  <miguel@helixcode.com>

	* e-table.c (e_table_class_init): Add argument handling here.

	* e-table-group-leaf.c (e_table_group_apply_to_leafs): New method.
	Enables us to walk all the children of an ETableGroup.

	* e-table.c (et_get_arg, et_set_arg): Implement ::get and ::set
	methods.
	(e_table_construct_from_spec_file): Now we return the etable.
	(e_table_construct): ditto.
	(et_real_construct): Now we return the ETable.  Returns NULL on
	construct failure.
	(e_table_new): ditto.
	(e_table_new_from_spec_file): ditto.

	* (et_build_grouping_spec): Removed vestige code that still
	contained references to the etable->specification XML code.

	Dumped all the ifdefed out code.

	* e-table.h: Removed ETable->specification finally.

svn path=/trunk/; revision=2632

23 files changed, 523 insertions, 998 deletions

diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index a672a3742b..2a60039563 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,26 @@
+2000-04-24  Miguel de Icaza  <miguel@helixcode.com>
+
+	* e-table.c (e_table_class_init): Add argument handling here.
+
+	* e-table-group-leaf.c (e_table_group_apply_to_leafs): New method.
+	Enables us to walk all the children of an ETableGroup.
+
+	* e-table.c (et_get_arg, et_set_arg): Implement ::get and ::set
+	methods.
+	(e_table_construct_from_spec_file): Now we return the etable.
+	(e_table_construct): ditto.
+	(et_real_construct): Now we return the ETable.  Returns NULL on
+	construct failure. 
+	(e_table_new): ditto.
+	(e_table_new_from_spec_file): ditto.
+
+	* (et_build_grouping_spec): Removed vestige code that still
+	contained references to the etable->specification XML code.
+
+	Dumped all the ifdefed out code. 
+	
+	* e-table.h: Removed ETable->specification finally.
+	
 2000-04-25  Christopher James Lahey  <clahey@helixcode.com>
 
 	* e-table-size-test.c: Fixed a warning.
diff --git a/widgets/e-table/e-table-config.c b/widgets/e-table/e-table-config.c
index d99bfea2f1..7b4837e9b6 100644
--- a/widgets/e-table/e-table-config.c
+++ b/widgets/e-table/e-table-config.c
@@ -98,7 +98,7 @@ load_label_data (GladeXML *gui, ETable *etable)
 	xmlNode *xmlRoot;
 	char *s;
 	
-	xmlRoot = xmlDocGetRootElement (etable->specification);
+/*	xmlRoot = xmlDocGetRootElement (etable->specification); */
 
 	s = get_fields (etable, xmlRoot);
 	load_data (gui, "label1", s);
diff --git a/widgets/e-table/e-table-group-container.c b/widgets/e-table/e-table-group-container.c
index f660cd01c3..ac93cecc69 100644
--- a/widgets/e-table/e-table-group-container.c
+++ b/widgets/e-table/e-table-group-container.c
@@ -12,6 +12,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include "e-table-group-container.h"
+#include "e-table-group-leaf.h"
 #include "e-table-item.h"
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include "e-util/e-util.h"
@@ -81,19 +82,19 @@ etgc_destroy (GtkObject *object)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
 
-	if (etgc->font){
+	if (etgc->font)
 		gdk_font_unref (etgc->font);
 		etgc->font = NULL;
-	}
-	if (etgc->ecol){
+
+	if (etgc->ecol)
 		gtk_object_unref (GTK_OBJECT(etgc->ecol));
-	}
-	if (etgc->sort_info){
+
+	if (etgc->sort_info)
 		gtk_object_unref (GTK_OBJECT(etgc->sort_info));
-	}
-	if (etgc->rect){
+
+	if (etgc->rect)
 		gtk_object_destroy (GTK_OBJECT(etgc->rect));
-	}	
+
 	e_table_group_container_list_free (etgc);
 
 	GTK_OBJECT_CLASS (etgc_parent_class)->destroy (object);
@@ -555,7 +556,7 @@ child_row_selection (ETableGroup *etg, int row, gboolean selected,
 static void
 etgc_add (ETableGroup *etg, gint row)
 {
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
+	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row);
 	GCompareFunc comp = etgc->ecol->compare;
 	GList *list = etgc->children;
@@ -565,7 +566,8 @@ etgc_add (ETableGroup *etg, gint row)
 
 	for (; list; list = g_list_next (list), i++){
 		int comp_val;
-		child_node = (ETableGroupContainerChildNode *)(list->data);
+
+		child_node = list->data;
 		comp_val = (*comp)(child_node->key, val);
 		if (comp_val == 0) {
 			child = child_node->child;
@@ -881,6 +883,23 @@ etgc_init (GtkObject *object)
 
 E_MAKE_TYPE (e_table_group_container, "ETableGroupContainer", ETableGroupContainer, etgc_class_init, etgc_init, PARENT_TYPE);
 
+void
+e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure)
+{
+	if (E_IS_TABLE_GROUP_CONTAINER (etg)){
+		ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
+		GList *list = etgc->children;
 
+		for (list = etgc->children; list; list = list->next){
+			ETableGroupContainerChildNode *child_node = list->data;
 
+			e_table_group_apply_to_leafs (child_node->child, fn, closure);
+		}
+	} else if (E_IS_TABLE_GROUP_LEAF (etg)){
+		(*fn) (E_TABLE_GROUP_LEAF (etg)->item, closure);
+	} else {
+		g_error ("Unknown ETableGroup found: %s",
+			 gtk_type_name (GTK_OBJECT (etg)->klass->type));
+	}
+}
 
diff --git a/widgets/e-table/e-table-group-leaf.c b/widgets/e-table/e-table-group-leaf.c
index dcb606d3b8..bfa72e86ab 100644
--- a/widgets/e-table/e-table-group-leaf.c
+++ b/widgets/e-table/e-table-group-leaf.c
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
+#include "e-table-group-container.h"
 #include "e-table-group-leaf.h"
 #include "e-table-item.h"
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
diff --git a/widgets/e-table/e-table-group-leaf.h b/widgets/e-table/e-table-group-leaf.h
index 1be5969af4..3f39fe95dd 100644
--- a/widgets/e-table/e-table-group-leaf.h
+++ b/widgets/e-table/e-table-group-leaf.h
@@ -35,6 +35,8 @@ ETableGroup *e_table_group_leaf_new       (GnomeCanvasGroup *parent,
 					   ETableHeader     *header,
 					   ETableModel *model,
 					   ETableSortInfo *sort_info);
-GtkType          e_table_group_leaf_get_type  (void);
+GtkType      e_table_group_leaf_get_type  (void);
+
 
 #endif /* _E_TABLE_GROUP_LEAF_H_ */
+
diff --git a/widgets/e-table/e-table-group.c b/widgets/e-table/e-table-group.c
index a829d83546..45fd6e6a79 100644
--- a/widgets/e-table/e-table-group.c
+++ b/widgets/e-table/e-table-group.c
@@ -3,9 +3,10 @@
  * E-Table-Group.c: Implements the grouping objects for elements on a table
  *
  * Author:
- *   Miguel de Icaza (miguel@gnu.org ()
+ *   Miguel de Icaza (miguel@helixcode.com)
+ *   Chris Lahey (clahey@helixcode.com)
  *
- * Copyright 1999, Helix Code, Inc.
+ * Copyright 1999, 2000 Helix Code, Inc.
  */
 
 #include <config.h>
@@ -358,5 +359,3 @@ etg_class_init (GtkObjectClass *object_class)
 
 E_MAKE_TYPE (e_table_group, "ETableGroup", ETableGroup, etg_class_init, NULL, PARENT_TYPE);
 
-
-
diff --git a/widgets/e-table/e-table-group.h b/widgets/e-table/e-table-group.h
index 877f38cf3f..43d8884a90 100644
--- a/widgets/e-table/e-table-group.h
+++ b/widgets/e-table/e-table-group.h
@@ -93,4 +93,8 @@ void             e_table_group_row_selection (ETableGroup      *etg,
 
 GtkType          e_table_group_get_type  (void);
 
+typedef void (*ETableGroupLeafFn) (void *e_table_item, void *closure);
+void         e_table_group_apply_to_leafs (ETableGroup *etg,
+					   ETableGroupLeafFn fn, void *closure);
+
 #endif /* _E_TABLE_GROUP_H_ */
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index 7f7494787a..5174f4a731 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -5,7 +5,7 @@
  * Author:
  *   Miguel de Icaza (miguel@gnu.org)
  *
- * Copyright 1999, Helix Code, Inc.
+ * Copyright 1999, 2000 Helix Code, Inc.
  */
 #include <config.h>
 #include <gtk/gtksignal.h>
@@ -221,17 +221,26 @@ ethi_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 	case ARG_SORT_INFO:
 		if (ethi->sort_info){
 			if (ethi->sort_info_changed_id)
-				gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->sort_info_changed_id);
+				gtk_signal_disconnect (
+					GTK_OBJECT(ethi->sort_info),
+					ethi->sort_info_changed_id);
+
 			if (ethi->group_info_changed_id)
-				gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->group_info_changed_id);
+				gtk_signal_disconnect (
+					GTK_OBJECT(ethi->sort_info),
+					ethi->group_info_changed_id);
 			gtk_object_unref (GTK_OBJECT(ethi->sort_info));
 		}
 		ethi->sort_info = GTK_VALUE_POINTER (*arg);
 		gtk_object_ref (GTK_OBJECT(ethi->sort_info));
-		ethi->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT(ethi->sort_info), "sort_info_changed",
-								 GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
-		ethi->group_info_changed_id = gtk_signal_connect (GTK_OBJECT(ethi->sort_info), "group_info_changed",
-								  GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
+		ethi->sort_info_changed_id =
+			gtk_signal_connect (
+				GTK_OBJECT(ethi->sort_info), "sort_info_changed",
+				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
+		ethi->group_info_changed_id =
+			gtk_signal_connect (
+				GTK_OBJECT(ethi->sort_info), "group_info_changed",
+				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
 		break;
 		
 	}
@@ -405,7 +414,8 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
 		gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
 
 	if (!ethi->stipple)
-		ethi->stipple = gdk_bitmap_create_from_data  (NULL, gray50_bits, gray50_width, gray50_height);
+		ethi->stipple = gdk_bitmap_create_from_data  (
+			NULL, gray50_bits, gray50_width, gray50_height);
 	
 	x1 = ethi->x1 + (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
 	if (ethi->drag_col > 0)
@@ -416,7 +426,9 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
 		gnome_canvas_rect_get_type (),
 		"x1", x1 + 1,
 		"y1", (double) ethi->y1 + 1,
-		"x2", (double) x1 + e_table_header_col_diff (ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
+		"x2", (double) x1 + e_table_header_col_diff (
+			ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
+
 		"y2", (double) ethi->y1 + ethi->height - 2,
 		"fill_color", "red",
 		"fill_stipple", ethi->stipple,
@@ -912,6 +924,21 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 	g_hash_table_destroy (arrows);
 }
 
+static GtkMenu *
+ethi_create_context_menu (ETableHeaderItem *ethi)
+{
+}
+	
+static EPopupMenu ethi_context_menu [] = {
+	{ NULL, NULL, NULL, 0 }
+};
+
+static void
+ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
+{
+	e_popup_menu_run (ethi_context_menu, event, 0, ethi);
+}
+
 /*
  * Handles the events on the ETableHeaderItem, particularly it handles resizing
  */
@@ -995,6 +1022,8 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 				ethi->click_x = e->button.x;
 				ethi->click_y = e->button.y;
 				ethi->maybe_drag = TRUE;
+			} else if (e->button.button == 3){
+				ethi_header_context_menu (ethi, &e->button);
 			}
 		}
 		break;
diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c
index 893380dc73..0a243d470a 100644
--- a/widgets/e-table/e-table-item.c
+++ b/widgets/e-table/e-table-item.c
@@ -44,7 +44,7 @@ enum {
 	
 	ARG_WIDTH,
 	ARG_HEIGHT,
-	ARG_HAS_FOCUS
+	ARG_HAS_FOCUS,
 };
 
 static int eti_get_height (ETableItem *eti);
@@ -643,6 +643,7 @@ eti_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 	case ARG_MODE_SPREADSHEET:
 		eti->mode_spreadsheet = GTK_VALUE_BOOL (*arg);
 		break;
+
 	}
 	eti->needs_redraw = 1;
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(eti));
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index bddf572fb9..1c89a45ea9 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -3,7 +3,8 @@
  * E-table.c: A graphical view of a Table.
  *
  * Author:
- *   Miguel de Icaza (miguel@gnu.org)
+ *   Miguel de Icaza (miguel@helixcode.com)
+ *   Chris Lahey (clahey@helixcode.com)
  *
  * Copyright 1999, Helix Code, Inc
  */
@@ -26,6 +27,7 @@
 #include "e-table-subset.h"
 #include "e-table-item.h"
 #include "e-table-group.h"
+#include "e-table-group-leaf.h"
 
 #define COLUMN_HEADER_HEIGHT 16
 #define TITLE_HEIGHT         16
@@ -40,6 +42,12 @@ enum {
 	LAST_SIGNAL
 };
 
+enum {
+	ARG_0,
+	ARG_TABLE_DRAW_GRID,
+	ARG_TABLE_DRAW_FOCUS
+};
+
 static gint et_signals [LAST_SIGNAL] = { 0, };
 
 static void e_table_fill_table (ETable *e_table, ETableModel *model);
@@ -140,405 +148,6 @@ e_table_setup_header (ETable *e_table)
 	gtk_widget_set_usize (GTK_WIDGET (e_table->header_canvas), -1, COLUMN_HEADER_HEIGHT);
 }
 
-#if 0
-typedef struct {
-	void *value;
-	GArray *array;
-} group_key_t;
-
-static GArray *
-e_table_create_groups (ETableModel *etm, int key_col, GCompareFunc comp)
-{
-	GArray *groups;
-	const int rows = e_table_model_row_count (etm);
-	int row, i;
-	
-	groups = g_array_new (FALSE, FALSE, sizeof (group_key_t));
-
-	for (row = 0; row < rows; row++){
-		void *val = e_table_model_value_at (etm, key_col, row);
-		const int n_groups = groups->len;
-
-		/*
-		 * Should replace this with a bsearch later
-		 */
-		for (i = 0; i < n_groups; i++){
-			group_key_t *g = &g_array_index (groups, group_key_t, i);
-  			
-			if ((*comp) (g->value, val)){
-				g_array_append_val (g->array, row);
-				break;
-			}
-		}
-		if (i != n_groups)
-			continue;
-
-		/*
-		 * We need to create a new group
-		 */
-		{
-			group_key_t gk;
-
-			gk.value = val;
-			gk.array = g_array_new (FALSE, FALSE, sizeof (int));
-
-			g_array_append_val (gk.array, row);
-			g_array_append_val (groups, gk);
-		}
-	}
-
-	return groups;
-}
-
-static void
-e_table_destroy_groups (GArray *groups)
-{
-	const int n = groups->len;
-	int i;
-	
-	for (i = 0; i < n; i++){
-		group_key_t *g = &g_array_index (groups, group_key_t, i);
-
-		g_array_free (g->array, TRUE);
-	}
-	g_array_free (groups, TRUE);
-}
-
-static ETableModel **
-e_table_make_subtables (ETableModel *model, GArray *groups)
-{
-	const int n_groups = groups->len;
-	ETableModel **tables;
-	int i;
-
-	tables = g_new (ETableModel *, n_groups+1);
-
-	for (i = 0; i < n_groups; i++){
-		group_key_t *g = &g_array_index (groups, group_key_t, i);
-		const int sub_size = g->array->len;
-		ETableSubset *ss;
-		int j;
-
-		tables [i] = e_table_subset_new (model, sub_size);
-		ss = E_TABLE_SUBSET (tables [i]);
-		
-		for (j = 0; j < sub_size; j++)
-			ss->map_table [j] = g_array_index (g->array, int, j);
-	}
-	tables [i] = NULL;
-		
-	return (ETableModel **) tables;
-}
-
-typedef struct _Node Node;
-
-struct _Node {
-	Node            *parent;
-	GnomeCanvasItem *item;
-	ETableModel     *table_model;
-	GSList          *children;
-
-	guint is_leaf:1;
-};
-
-static Node *
-leaf_new (GnomeCanvasItem *table_item, ETableModel *table_model, Node *parent)
-{
-	Node *node = g_new (Node, 1);
-
-	g_assert (table_item != NULL);
-	g_assert (table_model != NULL);
-	g_assert (parent != NULL);
-	
-	node->item = table_item;
-	node->parent = parent;
-	node->table_model = table_model;
-	node->is_leaf = 1;
-
-	g_assert (!parent->is_leaf);
-	
-	parent->children = g_slist_append (parent->children, node);
-
-	e_table_group_add (E_TABLE_GROUP (parent->item), table_item);
-
-	return node;
-}
-
-static Node *
-node_new (GnomeCanvasItem *group_item, ETableModel *table_model, Node *parent)
-{
-	Node *node = g_new (Node, 1);
-
-	g_assert (table_model != NULL);
-
-	node->children = NULL;
-	node->item = group_item;
-	node->parent = parent;
-	node->table_model = table_model;
-	node->is_leaf = 0;
-
-	if (parent){
-		parent->children = g_slist_append (parent->children, node);
-
-		e_table_group_add (E_TABLE_GROUP (parent->item), group_item);
-	}
-	
-	return node;
-}
-
-static Node *
-e_table_create_leaf (ETable *e_table, ETableModel *etm, Node *parent)
-{
-	GnomeCanvasItem *table_item;
-	Node *leaf;
-	
-	table_item = gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (parent->item),
-		e_table_item_get_type (),
-		"ETableHeader", e_table->header,
-		"ETableModel",  etm,
-		"drawgrid", e_table->draw_grid,
-		"drawfocus", e_table->draw_focus,
-		"spreadsheet", e_table->spreadsheet,
-		NULL);
-
-	leaf = leaf_new (table_item, etm, parent);
-	
-	return leaf;
-}
-
-static int
-leaf_height (Node *leaf)
-{
-	const GnomeCanvasItem *item = leaf->item;
-	
-	return item->y2 - item->y1;
-}
-
-static int
-leaf_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	static int last_x = -1;
-	static int last_y = -1;
-	
-	if (event->type == GDK_BUTTON_PRESS){
-		last_x = event->button.x;
-		last_y = event->button.y;
-	} else if (event->type == GDK_BUTTON_RELEASE){
-		last_x = -1;
-		last_y = -1;
-	} else if (event->type == GDK_MOTION_NOTIFY){
-		if (last_x == -1)
-			return FALSE;
-		
-		gnome_canvas_item_move (item, event->motion.x - last_x, event->motion.y - last_y);
-		last_x = event->motion.x;
-		last_y = event->motion.y;
-	} else
-		return FALSE;
-	return TRUE;
-}
-
-static Node *
-e_table_create_nodes (ETable *e_table, ETableModel *model, ETableHeader *header,
-		      GnomeCanvasGroup *root, Node *parent, int *groups_list)
-{
-	GArray *groups;
-	ETableModel **tables;
-	ETableCol *ecol;
-	int key_col, i;
-	GnomeCanvasItem *group_item;
-	Node *group;
-
-	key_col = *groups_list;
-	g_assert (key_col != -1);
-	
-	/*
-	 * Create groups
-	 */
-	ecol = e_table_header_get_column (header, key_col);
-
-	g_assert (ecol != NULL);
-	
-	groups = e_table_create_groups (model, key_col, ecol->compare);
-	tables = e_table_make_subtables (e_table->model, groups);
-	e_table_destroy_groups (groups);
-	group_item = gnome_canvas_item_new (root,
-					    e_table_group_get_type (),
-					    "columns", ecol, TRUE, parent == NULL);
-	group = node_new (group_item, model, parent);
-	
-	for (i = 0; tables [i] != NULL; i++){
-		/*
-		 * Leafs
-		 */
-		if (groups_list [1] == -1){
-			GnomeCanvasItem *item_leaf_header;
-			Node *leaf_header;
-			
-			/* FIXME *//*
-			item_leaf_header = e_table_group_new (
-			GNOME_CANVAS_GROUP (group_item), ecol, TRUE, FALSE);*/
-			leaf_header = node_new (item_leaf_header, tables [i], group);
-
-			e_table_create_leaf (e_table, tables [i], leaf_header);
-		} else {
-			e_table_create_nodes (
-				e_table, tables [i], header, GNOME_CANVAS_GROUP (group_item),
-				group, &groups_list [1]);
-		}
-	}
-
-	return group;
-}
-
-static int *
-group_spec_to_desc (const char *group_spec)
-{
-	int a_size = 10;
-	int *elements;
-	char *p, *copy, *follow;
-	int n_elements = 0;
-
-	if (group_spec == NULL)
-		return NULL;
-
-	elements = g_new (int, a_size);	
-	copy = alloca (strlen (group_spec) + 1);
-	strcpy (copy, group_spec);
-
-	while ((p = strtok_r (copy, ",", &follow)) != NULL){
-		elements [n_elements] = atoi (p);
-		++n_elements;
-		if (n_elements+1 == a_size){
-			int *new_e;
-			
-			n_elements += 10;
-			new_e = g_renew (int, elements, n_elements);
-			if (new_e == NULL){
-				g_free (elements);
-				return NULL;
-			}
-			elements = new_e;
-		}
-		copy = NULL;
-	}
-
-	/* Tag end */
-	elements [n_elements] = -1;
-	
-	return elements;
-}
-
-/*
- * The ETableCanvas object is just used to enable us to
- * hook up to the realize/unrealize phases of the canvas
- * initialization (as laying out the subtables requires us to
- * know the actual size of the subtables we are inserting
- */
- 
-#define E_TABLE_CANVAS_PARENT_TYPE gnome_canvas_get_type ()
-
-typedef struct {
-	GnomeCanvas base;
-
-	ETable *e_table;
-} ETableCanvas;
-
-typedef struct {
-	GnomeCanvasClass base_class;
-} ETableCanvasClass;
-
-static GnomeCanvasClass *e_table_canvas_parent_class;
-
-static void
-e_table_canvas_realize (GtkWidget *widget)
-{
-#if 0
-	GnomeCanvasItem *group_item;
-	
-	group_item = gnome_canvas_item_new (root,
-					    e_table_group_get_type (),
-					    "header", E_TABLE, TRUE, parent == NULL);
-	
-
-	ETableCanvas *e_table_canvas = (ETableCanvas *) widget;
-	ETable *e_table = e_table_canvas->e_table;
-	int *groups;
-	Node *leaf;
-	
-	GTK_WIDGET_CLASS (e_table_canvas_parent_class)->realize (widget);
-	
-	groups = group_spec_to_desc (e_table->group_spec);
-
-	
-
-	leaf = e_table_create_nodes (
-		e_table, e_table->model,
-		e_table->header, GNOME_CANVAS_GROUP (e_table->root), 0, groups);
-
-	
-	if (groups)
-		g_free (groups);
-#endif
-}
-
-static void
-e_table_canvas_unrealize (GtkWidget *widget)
-{
-	ETableCanvas *e_table_canvas = (ETableCanvas *) widget;
-	ETable *e_table = e_table_canvas->e_table;
-	
-	gtk_object_destroy (GTK_OBJECT (e_table->root));
-
-	GTK_WIDGET_CLASS (e_table_canvas_parent_class)->unrealize (widget);
-}
-
-static void
-e_table_canvas_class_init (GtkObjectClass *object_class)
-{
-	GtkWidgetClass *widget_class = (GtkWidgetClass *) object_class;
-
-	widget_class->realize = e_table_canvas_realize;
-	widget_class->unrealize = e_table_canvas_unrealize;
-
-	e_table_canvas_parent_class = gtk_type_class (E_TABLE_CANVAS_PARENT_TYPE);
-}
-
-static void
-e_table_canvas_init (GtkObject *canvas)
-{
-	ETableCanvas *e_table_canvas = (ETableCanvas *) (canvas);
-	ETable *e_table = e_table_canvas->e_table;
-	
-	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
-
-}
-
-GtkType e_table_canvas_get_type (void);
-
-E_MAKE_TYPE (e_table_canvas, "ETableCanvas", ETableCanvas, e_table_canvas_class_init,
-	     e_table_canvas_init, E_TABLE_CANVAS_PARENT_TYPE);
-
-static GnomeCanvas *
-e_table_canvas_new (ETable *e_table)
-{
-	ETableCanvas *e_table_canvas;
-
-	e_table_canvas = gtk_type_new (e_table_canvas_get_type ());
-	e_table_canvas->e_table = e_table;
-	
-	e_table->root = gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (GNOME_CANVAS (e_table_canvas)->root),
-		gnome_canvas_group_get_type (),
-		"x", 0.0,
-		"y", 0.0,
-		NULL);
-
-	return GNOME_CANVAS (e_table_canvas);
-}
-#endif
-
 static void
 table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 			    ETable *e_table)
@@ -663,14 +272,13 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
 				 
 	gtk_widget_show (GTK_WIDGET (e_table->table_canvas));
 	
-	e_table->group = e_table_group_new (GNOME_CANVAS_GROUP (e_table->table_canvas->root),
-					    full_header,
-					    header,
-					    model,
-					    e_table->sort_info,
-					    0);
-	gtk_signal_connect (GTK_OBJECT(e_table->group), "row_selection",
-			   GTK_SIGNAL_FUNC(group_row_selection), e_table);
+	e_table->group = e_table_group_new (
+		GNOME_CANVAS_GROUP (e_table->table_canvas->root),
+		full_header, header,
+		model, e_table->sort_info, 0);
+
+	gtk_signal_connect (GTK_OBJECT (e_table->group), "row_selection",
+			    GTK_SIGNAL_FUNC(group_row_selection), e_table);
 	
 	e_table->table_model_change_id = gtk_signal_connect (
 		GTK_OBJECT (model), "model_changed",
@@ -761,7 +369,7 @@ et_grouping_xml_to_sort_info (ETable *table, xmlNode *grouping)
 				    GTK_SIGNAL_FUNC (sort_info_changed), table);
 }
 
-static void
+static ETable *
 et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 		   xmlDoc *xmlSpec)
 {
@@ -771,21 +379,19 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 	
 	GtkWidget *scrolledwindow;
 
+	xmlRoot = xmlDocGetRootElement (xmlSpec);
+	xmlColumns = e_xml_get_child_by_name (xmlRoot, "columns-shown");
+	xmlGrouping = e_xml_get_child_by_name (xmlRoot, "grouping");
+
+	if ((xmlColumns == NULL) || (xmlGrouping == NULL))
+		return NULL;
+	
 	e_table->full_header = full_header;
 	gtk_object_ref (GTK_OBJECT (full_header));
 
 	e_table->model = etm;
 	gtk_object_ref (GTK_OBJECT (etm));
 
-	xmlRoot = xmlDocGetRootElement (xmlSpec);
-	
-	xmlColumns = e_xml_get_child_by_name (xmlRoot, "columns-shown");
-	xmlGrouping = e_xml_get_child_by_name (xmlRoot, "grouping");
-	
-	/* TODO: unref the etm and full_header, if these things fail? */
-	g_return_if_fail (xmlColumns);
-	g_return_if_fail (xmlGrouping);
-	
 	gtk_widget_push_visual (gdk_rgb_get_visual ());
 	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
 
@@ -796,13 +402,18 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 	e_table_setup_table (e_table, full_header, e_table->header, etm);
 	e_table_fill_table (e_table, etm);
 
-	scrolledwindow = gtk_scrolled_window_new (gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas)),
-						  gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas)));
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
+	scrolledwindow = gtk_scrolled_window_new (
+		gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas)),
+		gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas)));
+	
+	gtk_scrolled_window_set_policy (
+		GTK_SCROLLED_WINDOW (scrolledwindow),
+		GTK_POLICY_NEVER,
+		GTK_POLICY_AUTOMATIC);
 	
-	gtk_container_add (GTK_CONTAINER (scrolledwindow), GTK_WIDGET(e_table->table_canvas));
+	gtk_container_add (
+		GTK_CONTAINER (scrolledwindow),
+		GTK_WIDGET (e_table->table_canvas));
 	gtk_widget_show (scrolledwindow);
 	
 	/*
@@ -825,31 +436,37 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 		
 	gtk_widget_pop_colormap ();
 	gtk_widget_pop_visual ();
+
+	return e_table;
 }
 
-void
-e_table_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
-		   const char *spec)
+ETable *
+e_table_construct (ETable *e_table, ETableHeader *full_header,
+		   ETableModel *etm, const char *spec)
 {
 	xmlDoc *xmlSpec;
 	char *copy;
 	copy = g_strdup (spec);
 
 	xmlSpec = xmlParseMemory (copy, strlen(copy));
-	et_real_construct (e_table, full_header, etm, xmlSpec);
+	e_table = et_real_construct (e_table, full_header, etm, xmlSpec);
 	xmlFreeDoc (xmlSpec);
 	g_free (copy);
+
+	return e_table;
 }
 
-void
+ETable *
 e_table_construct_from_spec_file (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 				  const char *filename)
 {
 	xmlDoc *xmlSpec;
 
 	xmlSpec = xmlParseFile (filename);
-	et_real_construct (e_table, full_header, etm, xmlSpec);
+	e_table = et_real_construct (e_table, full_header, etm, xmlSpec);
 	xmlFreeDoc (xmlSpec);
+
+	return e_table;
 }
 
 GtkWidget *
@@ -859,9 +476,9 @@ e_table_new (ETableHeader *full_header, ETableModel *etm, const char *spec)
 
 	e_table = gtk_type_new (e_table_get_type ());
 
-	e_table_construct (e_table, full_header, etm, spec);
+	e_table = e_table_construct (e_table, full_header, etm, spec);
 		
-	return (GtkWidget *) e_table;
+	return GTK_WIDGET (e_table);
 }
 
 GtkWidget *
@@ -871,7 +488,7 @@ e_table_new_from_spec_file (ETableHeader *full_header, ETableModel *etm, const c
 
 	e_table = gtk_type_new (e_table_get_type ());
 
-	e_table_construct_from_spec_file (e_table, full_header, etm, filename);
+	e_table = e_table_construct_from_spec_file (e_table, full_header, etm, filename);
 		
 	return (GtkWidget *) e_table;
 }
@@ -900,30 +517,31 @@ et_build_grouping_spec (ETable *e_table)
 {
 	xmlNode *node;
 	xmlNode *grouping;
-	xmlNode *root;
 	int i;
-	int length;
-
-	root = xmlDocGetRootElement (e_table->specification);
-	xmlCopyNode (e_xml_get_child_by_name(root, "grouping"), TRUE);
+	const int sort_count = e_table_sort_info_sorting_get_count (e_table->sort_info);
+	const int group_count = e_table_sort_info_grouping_get_count (e_table->sort_info);
+	
 	grouping = xmlNewNode (NULL, "grouping");
 	node = grouping;
-	length = e_table_sort_info_grouping_get_count(e_table->sort_info);
-	for (i = 0; i < length; i++) {
+
+	for (i = 0; i < group_count; i++) {
 		ETableSortColumn column = e_table_sort_info_grouping_get_nth(e_table->sort_info, i);
 		xmlNode *new_node = xmlNewChild(node, NULL, "group", NULL);
+
 		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
 		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
 		node = new_node;
 	}
-	length = e_table_sort_info_sorting_get_count(e_table->sort_info);
-	for (i = 0; i < length; i++) {
+
+	for (i = 0; i < sort_count; i++) {
 		ETableSortColumn column = e_table_sort_info_sorting_get_nth(e_table->sort_info, i);
 		xmlNode *new_node = xmlNewChild(node, NULL, "leaf", NULL);
+		
 		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
 		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
 		node = new_node;
 	}
+
 	return grouping;
 }
 
@@ -932,27 +550,30 @@ et_build_tree (ETable *e_table)
 {
 	xmlDoc *doc;
 	xmlNode *root;
+
 	doc = xmlNewDoc ("1.0");
 	if (doc == NULL)
 		return NULL;
+	
 	root = xmlNewDocNode (doc, NULL, "ETableSpecification", NULL);
 	xmlDocSetRootElement (doc, root);
-	xmlAddChild (root, et_build_column_spec(e_table));
-	xmlAddChild (root, et_build_grouping_spec(e_table));
+	xmlAddChild (root, et_build_column_spec (e_table));
+	xmlAddChild (root, et_build_grouping_spec (e_table));
+
 	return doc;
 }
 
 gchar *
 e_table_get_specification (ETable *e_table)
 {
-	xmlDoc *doc = et_build_tree (e_table);
+	xmlDoc *doc;
 	xmlChar *buffer;
 	gint size;
 
-	xmlDocDumpMemory (doc,
-			 &buffer,
-			 &size);
+	doc = et_build_tree (e_table);
+	xmlDocDumpMemory (doc, &buffer, &size);
 	xmlFreeDoc (doc);
+
 	return buffer;
 }
 
@@ -965,15 +586,68 @@ e_table_save_specification (ETable *e_table, gchar *filename)
 	xmlFreeDoc (doc);
 }
 
+static void
+et_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+{
+	ETable *etable = E_TABLE (o);
+
+	switch (arg_id){
+	case ARG_TABLE_DRAW_GRID:
+		GTK_VALUE_BOOL (*arg) = etable->draw_grid;
+		break;
+
+	case ARG_TABLE_DRAW_FOCUS:
+		GTK_VALUE_BOOL (*arg) = etable->draw_focus;
+		break;
+	}
+}
+
+typedef struct {
+	char     *arg;
+	gboolean  setting;
+} bool_closure;
 
 static void
+leaf_bool_change (void *etgl, void *closure)
+{
+	bool_closure *bc = closure;
+	
+	gtk_object_set (GTK_OBJECT (etgl), bc->arg, bc->setting, NULL);
+}
+
+static void
+et_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+{
+	ETable *etable = E_TABLE (o);
+	bool_closure bc;
+	
+	switch (arg_id){
+	case ARG_TABLE_DRAW_GRID:
+		etable->draw_grid = GTK_VALUE_BOOL (*arg);
+		bc.arg = "drawgrid";
+		bc.setting = etable->draw_grid;
+		e_table_group_apply_to_leafs (etable->group, leaf_bool_change, &bc);
+		break;
+
+	case ARG_TABLE_DRAW_FOCUS:
+		etable->draw_focus = GTK_VALUE_BOOL (*arg);
+		bc.arg = "drawfocus";
+		bc.setting = etable->draw_focus;
+		e_table_group_apply_to_leafs (etable->group, leaf_bool_change, &bc);
+		break;
+	}
+}
+	
+static void
 e_table_class_init (GtkObjectClass *object_class)
 {
 	ETableClass *klass = E_TABLE_CLASS(object_class);
 	e_table_parent_class = gtk_type_class (PARENT_TYPE);
 
 	object_class->destroy = et_destroy;
-
+	object_class->set_arg = et_set_arg;
+	object_class->get_arg = et_get_arg;
+	
 	klass->row_selection = NULL;
 
 	et_signals [ROW_SELECTION] =
@@ -985,6 +659,13 @@ e_table_class_init (GtkObjectClass *object_class)
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
 	
 	gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL);
+
+	gtk_object_add_arg_type ("ETable::drawgrid", GTK_TYPE_BOOL,
+				 GTK_ARG_READWRITE, ARG_TABLE_DRAW_GRID);
+	gtk_object_add_arg_type ("ETable::drawfocus", GTK_TYPE_BOOL,
+				 GTK_ARG_READWRITE, ARG_TABLE_DRAW_FOCUS);
+	
+	
 }
 
 E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE);
diff --git a/widgets/e-table/e-table.h b/widgets/e-table/e-table.h
index d8c4709621..61fc5a41ae 100644
--- a/widgets/e-table/e-table.h
+++ b/widgets/e-table/e-table.h
@@ -40,17 +40,18 @@ typedef struct {
 
 	GnomeCanvasItem *header_item, *root;
 
-	xmlDoc *specification;
-	
-	guint draw_grid:1;
-	guint draw_focus:1;
-	guint spreadsheet:1;
-	
 	guint need_rebuild:1;
 	guint need_row_changes:1;
 	
 	GHashTable *row_changes_list;
 	gint rebuild_idle_id;
+
+	/*
+	 * Configuration settings
+	 */
+	guint draw_grid:1;
+	guint draw_focus:1;
+	guint spreadsheet:1;
 } ETable;
 
 typedef struct {
@@ -59,19 +60,21 @@ typedef struct {
 	void        (*row_selection)      (ETable *et, int row, gboolean selected);
 } ETableClass;
 
-GtkType    e_table_get_type  (void);
-void       e_table_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
-			      const char *spec);
-GtkWidget *e_table_new       (ETableHeader *full_header, ETableModel *etm,
-			      const char *spec);
+GtkType    e_table_get_type   		    (void);
 
-void       e_table_construct_from_spec_file (ETable *e_table,
+ETable    *e_table_construct  		    (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
+			      		     const char *spec);
+GtkWidget *e_table_new        		    (ETableHeader *full_header, ETableModel *etm,
+			      		     const char *spec);
+
+ETable    *e_table_construct_from_spec_file (ETable *e_table,
 					     ETableHeader *full_header,
 					     ETableModel *etm,
 					     const char *filename);
 GtkWidget *e_table_new_from_spec_file       (ETableHeader *full_header,
 					     ETableModel *etm,
 					     const char *filename);
+
 gchar     *e_table_get_specification        (ETable *e_table);
 void       e_table_save_specification       (ETable *e_table, gchar *filename);
 
diff --git a/widgets/e-table/test-table.c b/widgets/e-table/test-table.c
index 4f2abffb13..38f690ec43 100644
--- a/widgets/e-table/test-table.c
+++ b/widgets/e-table/test-table.c
@@ -290,9 +290,18 @@ row_selection_test (ETable *table, int row, gboolean selected)
 }
 
 static void
+toggle_grid (void *nothing, ETable *etable)
+{
+	static gboolean shown;
+
+	gtk_object_get (GTK_OBJECT (etable), "drawgrid", &shown, NULL);
+	gtk_object_set (GTK_OBJECT (etable), "drawgrid", !shown, NULL);
+}
+
+static void
 do_e_table_demo (const char *spec)
 {
-	GtkWidget *e_table, *window, *frame, *vbox, *button;
+	GtkWidget *e_table, *window, *frame, *vbox, *button, *bhide;
 	ECell *cell_left_just;
 	ETableHeader *full_header;
 	int i;
@@ -328,23 +337,26 @@ do_e_table_demo (const char *spec)
 	gtk_signal_connect (GTK_OBJECT(e_table), "row_selection",
 			   GTK_SIGNAL_FUNC(row_selection_test), NULL);
 
-	button = gtk_button_new_with_label ("Save spec");
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (save_spec), e_table);
-
 	vbox = gtk_vbox_new (FALSE, 0);
-	
 	gtk_box_pack_start (GTK_BOX (vbox), e_table, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (frame), vbox);
 	gtk_container_add (GTK_CONTAINER (window), frame);
 
+	/*
+	 * gadgets
+	 */
+	button = gtk_button_new_with_label ("Save spec");
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			    GTK_SIGNAL_FUNC (save_spec), e_table);
+	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+	bhide = gtk_button_new_with_label ("Toggle Grid");
+	gtk_signal_connect (GTK_OBJECT (bhide), "clicked",
+			    GTK_SIGNAL_FUNC (toggle_grid), e_table);
+	gtk_box_pack_start (GTK_BOX (vbox), bhide, FALSE, FALSE, 0);
+
 	gtk_widget_set_usize (window, 200, 200);
-	gtk_widget_show (e_table);
-	gtk_widget_show (button);
-	gtk_widget_show (vbox);
-	gtk_widget_show (frame);
-	gtk_widget_show (window);
+	gtk_widget_show_all (window);
 
 	if (getenv ("TEST")){
 		e_table_do_gui_config (NULL, E_TABLE(e_table));
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index d99bfea2f1..7b4837e9b6 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -98,7 +98,7 @@ load_label_data (GladeXML *gui, ETable *etable)
 	xmlNode *xmlRoot;
 	char *s;
 	
-	xmlRoot = xmlDocGetRootElement (etable->specification);
+/*	xmlRoot = xmlDocGetRootElement (etable->specification); */
 
 	s = get_fields (etable, xmlRoot);
 	load_data (gui, "label1", s);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index f660cd01c3..ac93cecc69 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -12,6 +12,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include "e-table-group-container.h"
+#include "e-table-group-leaf.h"
 #include "e-table-item.h"
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include "e-util/e-util.h"
@@ -81,19 +82,19 @@ etgc_destroy (GtkObject *object)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
 
-	if (etgc->font){
+	if (etgc->font)
 		gdk_font_unref (etgc->font);
 		etgc->font = NULL;
-	}
-	if (etgc->ecol){
+
+	if (etgc->ecol)
 		gtk_object_unref (GTK_OBJECT(etgc->ecol));
-	}
-	if (etgc->sort_info){
+
+	if (etgc->sort_info)
 		gtk_object_unref (GTK_OBJECT(etgc->sort_info));
-	}
-	if (etgc->rect){
+
+	if (etgc->rect)
 		gtk_object_destroy (GTK_OBJECT(etgc->rect));
-	}	
+
 	e_table_group_container_list_free (etgc);
 
 	GTK_OBJECT_CLASS (etgc_parent_class)->destroy (object);
@@ -555,7 +556,7 @@ child_row_selection (ETableGroup *etg, int row, gboolean selected,
 static void
 etgc_add (ETableGroup *etg, gint row)
 {
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
+	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row);
 	GCompareFunc comp = etgc->ecol->compare;
 	GList *list = etgc->children;
@@ -565,7 +566,8 @@ etgc_add (ETableGroup *etg, gint row)
 
 	for (; list; list = g_list_next (list), i++){
 		int comp_val;
-		child_node = (ETableGroupContainerChildNode *)(list->data);
+
+		child_node = list->data;
 		comp_val = (*comp)(child_node->key, val);
 		if (comp_val == 0) {
 			child = child_node->child;
@@ -881,6 +883,23 @@ etgc_init (GtkObject *object)
 
 E_MAKE_TYPE (e_table_group_container, "ETableGroupContainer", ETableGroupContainer, etgc_class_init, etgc_init, PARENT_TYPE);
 
+void
+e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure)
+{
+	if (E_IS_TABLE_GROUP_CONTAINER (etg)){
+		ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
+		GList *list = etgc->children;
 
+		for (list = etgc->children; list; list = list->next){
+			ETableGroupContainerChildNode *child_node = list->data;
 
+			e_table_group_apply_to_leafs (child_node->child, fn, closure);
+		}
+	} else if (E_IS_TABLE_GROUP_LEAF (etg)){
+		(*fn) (E_TABLE_GROUP_LEAF (etg)->item, closure);
+	} else {
+		g_error ("Unknown ETableGroup found: %s",
+			 gtk_type_name (GTK_OBJECT (etg)->klass->type));
+	}
+}
 
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index dcb606d3b8..bfa72e86ab 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
+#include "e-table-group-container.h"
 #include "e-table-group-leaf.h"
 #include "e-table-item.h"
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 1be5969af4..3f39fe95dd 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -35,6 +35,8 @@ ETableGroup *e_table_group_leaf_new       (GnomeCanvasGroup *parent,
 					   ETableHeader     *header,
 					   ETableModel *model,
 					   ETableSortInfo *sort_info);
-GtkType          e_table_group_leaf_get_type  (void);
+GtkType      e_table_group_leaf_get_type  (void);
+
 
 #endif /* _E_TABLE_GROUP_LEAF_H_ */
+
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index a829d83546..45fd6e6a79 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -3,9 +3,10 @@
  * E-Table-Group.c: Implements the grouping objects for elements on a table
  *
  * Author:
- *   Miguel de Icaza (miguel@gnu.org ()
+ *   Miguel de Icaza (miguel@helixcode.com)
+ *   Chris Lahey (clahey@helixcode.com)
  *
- * Copyright 1999, Helix Code, Inc.
+ * Copyright 1999, 2000 Helix Code, Inc.
  */
 
 #include <config.h>
@@ -358,5 +359,3 @@ etg_class_init (GtkObjectClass *object_class)
 
 E_MAKE_TYPE (e_table_group, "ETableGroup", ETableGroup, etg_class_init, NULL, PARENT_TYPE);
 
-
-
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index 877f38cf3f..43d8884a90 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -93,4 +93,8 @@ void             e_table_group_row_selection (ETableGroup      *etg,
 
 GtkType          e_table_group_get_type  (void);
 
+typedef void (*ETableGroupLeafFn) (void *e_table_item, void *closure);
+void         e_table_group_apply_to_leafs (ETableGroup *etg,
+					   ETableGroupLeafFn fn, void *closure);
+
 #endif /* _E_TABLE_GROUP_H_ */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 7f7494787a..5174f4a731 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -5,7 +5,7 @@
  * Author:
  *   Miguel de Icaza (miguel@gnu.org)
  *
- * Copyright 1999, Helix Code, Inc.
+ * Copyright 1999, 2000 Helix Code, Inc.
  */
 #include <config.h>
 #include <gtk/gtksignal.h>
@@ -221,17 +221,26 @@ ethi_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 	case ARG_SORT_INFO:
 		if (ethi->sort_info){
 			if (ethi->sort_info_changed_id)
-				gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->sort_info_changed_id);
+				gtk_signal_disconnect (
+					GTK_OBJECT(ethi->sort_info),
+					ethi->sort_info_changed_id);
+
 			if (ethi->group_info_changed_id)
-				gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->group_info_changed_id);
+				gtk_signal_disconnect (
+					GTK_OBJECT(ethi->sort_info),
+					ethi->group_info_changed_id);
 			gtk_object_unref (GTK_OBJECT(ethi->sort_info));
 		}
 		ethi->sort_info = GTK_VALUE_POINTER (*arg);
 		gtk_object_ref (GTK_OBJECT(ethi->sort_info));
-		ethi->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT(ethi->sort_info), "sort_info_changed",
-								 GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
-		ethi->group_info_changed_id = gtk_signal_connect (GTK_OBJECT(ethi->sort_info), "group_info_changed",
-								  GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
+		ethi->sort_info_changed_id =
+			gtk_signal_connect (
+				GTK_OBJECT(ethi->sort_info), "sort_info_changed",
+				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
+		ethi->group_info_changed_id =
+			gtk_signal_connect (
+				GTK_OBJECT(ethi->sort_info), "group_info_changed",
+				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
 		break;
 		
 	}
@@ -405,7 +414,8 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
 		gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
 
 	if (!ethi->stipple)
-		ethi->stipple = gdk_bitmap_create_from_data  (NULL, gray50_bits, gray50_width, gray50_height);
+		ethi->stipple = gdk_bitmap_create_from_data  (
+			NULL, gray50_bits, gray50_width, gray50_height);
 	
 	x1 = ethi->x1 + (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
 	if (ethi->drag_col > 0)
@@ -416,7 +426,9 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
 		gnome_canvas_rect_get_type (),
 		"x1", x1 + 1,
 		"y1", (double) ethi->y1 + 1,
-		"x2", (double) x1 + e_table_header_col_diff (ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
+		"x2", (double) x1 + e_table_header_col_diff (
+			ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
+
 		"y2", (double) ethi->y1 + ethi->height - 2,
 		"fill_color", "red",
 		"fill_stipple", ethi->stipple,
@@ -912,6 +924,21 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 	g_hash_table_destroy (arrows);
 }
 
+static GtkMenu *
+ethi_create_context_menu (ETableHeaderItem *ethi)
+{
+}
+	
+static EPopupMenu ethi_context_menu [] = {
+	{ NULL, NULL, NULL, 0 }
+};
+
+static void
+ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
+{
+	e_popup_menu_run (ethi_context_menu, event, 0, ethi);
+}
+
 /*
  * Handles the events on the ETableHeaderItem, particularly it handles resizing
  */
@@ -995,6 +1022,8 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 				ethi->click_x = e->button.x;
 				ethi->click_y = e->button.y;
 				ethi->maybe_drag = TRUE;
+			} else if (e->button.button == 3){
+				ethi_header_context_menu (ethi, &e->button);
 			}
 		}
 		break;
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 893380dc73..0a243d470a 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -44,7 +44,7 @@ enum {
 	
 	ARG_WIDTH,
 	ARG_HEIGHT,
-	ARG_HAS_FOCUS
+	ARG_HAS_FOCUS,
 };
 
 static int eti_get_height (ETableItem *eti);
@@ -643,6 +643,7 @@ eti_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 	case ARG_MODE_SPREADSHEET:
 		eti->mode_spreadsheet = GTK_VALUE_BOOL (*arg);
 		break;
+
 	}
 	eti->needs_redraw = 1;
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(eti));
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index bddf572fb9..1c89a45ea9 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -3,7 +3,8 @@
  * E-table.c: A graphical view of a Table.
  *
  * Author:
- *   Miguel de Icaza (miguel@gnu.org)
+ *   Miguel de Icaza (miguel@helixcode.com)
+ *   Chris Lahey (clahey@helixcode.com)
  *
  * Copyright 1999, Helix Code, Inc
  */
@@ -26,6 +27,7 @@
 #include "e-table-subset.h"
 #include "e-table-item.h"
 #include "e-table-group.h"
+#include "e-table-group-leaf.h"
 
 #define COLUMN_HEADER_HEIGHT 16
 #define TITLE_HEIGHT         16
@@ -40,6 +42,12 @@ enum {
 	LAST_SIGNAL
 };
 
+enum {
+	ARG_0,
+	ARG_TABLE_DRAW_GRID,
+	ARG_TABLE_DRAW_FOCUS
+};
+
 static gint et_signals [LAST_SIGNAL] = { 0, };
 
 static void e_table_fill_table (ETable *e_table, ETableModel *model);
@@ -140,405 +148,6 @@ e_table_setup_header (ETable *e_table)
 	gtk_widget_set_usize (GTK_WIDGET (e_table->header_canvas), -1, COLUMN_HEADER_HEIGHT);
 }
 
-#if 0
-typedef struct {
-	void *value;
-	GArray *array;
-} group_key_t;
-
-static GArray *
-e_table_create_groups (ETableModel *etm, int key_col, GCompareFunc comp)
-{
-	GArray *groups;
-	const int rows = e_table_model_row_count (etm);
-	int row, i;
-	
-	groups = g_array_new (FALSE, FALSE, sizeof (group_key_t));
-
-	for (row = 0; row < rows; row++){
-		void *val = e_table_model_value_at (etm, key_col, row);
-		const int n_groups = groups->len;
-
-		/*
-		 * Should replace this with a bsearch later
-		 */
-		for (i = 0; i < n_groups; i++){
-			group_key_t *g = &g_array_index (groups, group_key_t, i);
-  			
-			if ((*comp) (g->value, val)){
-				g_array_append_val (g->array, row);
-				break;
-			}
-		}
-		if (i != n_groups)
-			continue;
-
-		/*
-		 * We need to create a new group
-		 */
-		{
-			group_key_t gk;
-
-			gk.value = val;
-			gk.array = g_array_new (FALSE, FALSE, sizeof (int));
-
-			g_array_append_val (gk.array, row);
-			g_array_append_val (groups, gk);
-		}
-	}
-
-	return groups;
-}
-
-static void
-e_table_destroy_groups (GArray *groups)
-{
-	const int n = groups->len;
-	int i;
-	
-	for (i = 0; i < n; i++){
-		group_key_t *g = &g_array_index (groups, group_key_t, i);
-
-		g_array_free (g->array, TRUE);
-	}
-	g_array_free (groups, TRUE);
-}
-
-static ETableModel **
-e_table_make_subtables (ETableModel *model, GArray *groups)
-{
-	const int n_groups = groups->len;
-	ETableModel **tables;
-	int i;
-
-	tables = g_new (ETableModel *, n_groups+1);
-
-	for (i = 0; i < n_groups; i++){
-		group_key_t *g = &g_array_index (groups, group_key_t, i);
-		const int sub_size = g->array->len;
-		ETableSubset *ss;
-		int j;
-
-		tables [i] = e_table_subset_new (model, sub_size);
-		ss = E_TABLE_SUBSET (tables [i]);
-		
-		for (j = 0; j < sub_size; j++)
-			ss->map_table [j] = g_array_index (g->array, int, j);
-	}
-	tables [i] = NULL;
-		
-	return (ETableModel **) tables;
-}
-
-typedef struct _Node Node;
-
-struct _Node {
-	Node            *parent;
-	GnomeCanvasItem *item;
-	ETableModel     *table_model;
-	GSList          *children;
-
-	guint is_leaf:1;
-};
-
-static Node *
-leaf_new (GnomeCanvasItem *table_item, ETableModel *table_model, Node *parent)
-{
-	Node *node = g_new (Node, 1);
-
-	g_assert (table_item != NULL);
-	g_assert (table_model != NULL);
-	g_assert (parent != NULL);
-	
-	node->item = table_item;
-	node->parent = parent;
-	node->table_model = table_model;
-	node->is_leaf = 1;
-
-	g_assert (!parent->is_leaf);
-	
-	parent->children = g_slist_append (parent->children, node);
-
-	e_table_group_add (E_TABLE_GROUP (parent->item), table_item);
-
-	return node;
-}
-
-static Node *
-node_new (GnomeCanvasItem *group_item, ETableModel *table_model, Node *parent)
-{
-	Node *node = g_new (Node, 1);
-
-	g_assert (table_model != NULL);
-
-	node->children = NULL;
-	node->item = group_item;
-	node->parent = parent;
-	node->table_model = table_model;
-	node->is_leaf = 0;
-
-	if (parent){
-		parent->children = g_slist_append (parent->children, node);
-
-		e_table_group_add (E_TABLE_GROUP (parent->item), group_item);
-	}
-	
-	return node;
-}
-
-static Node *
-e_table_create_leaf (ETable *e_table, ETableModel *etm, Node *parent)
-{
-	GnomeCanvasItem *table_item;
-	Node *leaf;
-	
-	table_item = gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (parent->item),
-		e_table_item_get_type (),
-		"ETableHeader", e_table->header,
-		"ETableModel",  etm,
-		"drawgrid", e_table->draw_grid,
-		"drawfocus", e_table->draw_focus,
-		"spreadsheet", e_table->spreadsheet,
-		NULL);
-
-	leaf = leaf_new (table_item, etm, parent);
-	
-	return leaf;
-}
-
-static int
-leaf_height (Node *leaf)
-{
-	const GnomeCanvasItem *item = leaf->item;
-	
-	return item->y2 - item->y1;
-}
-
-static int
-leaf_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	static int last_x = -1;
-	static int last_y = -1;
-	
-	if (event->type == GDK_BUTTON_PRESS){
-		last_x = event->button.x;
-		last_y = event->button.y;
-	} else if (event->type == GDK_BUTTON_RELEASE){
-		last_x = -1;
-		last_y = -1;
-	} else if (event->type == GDK_MOTION_NOTIFY){
-		if (last_x == -1)
-			return FALSE;
-		
-		gnome_canvas_item_move (item, event->motion.x - last_x, event->motion.y - last_y);
-		last_x = event->motion.x;
-		last_y = event->motion.y;
-	} else
-		return FALSE;
-	return TRUE;
-}
-
-static Node *
-e_table_create_nodes (ETable *e_table, ETableModel *model, ETableHeader *header,
-		      GnomeCanvasGroup *root, Node *parent, int *groups_list)
-{
-	GArray *groups;
-	ETableModel **tables;
-	ETableCol *ecol;
-	int key_col, i;
-	GnomeCanvasItem *group_item;
-	Node *group;
-
-	key_col = *groups_list;
-	g_assert (key_col != -1);
-	
-	/*
-	 * Create groups
-	 */
-	ecol = e_table_header_get_column (header, key_col);
-
-	g_assert (ecol != NULL);
-	
-	groups = e_table_create_groups (model, key_col, ecol->compare);
-	tables = e_table_make_subtables (e_table->model, groups);
-	e_table_destroy_groups (groups);
-	group_item = gnome_canvas_item_new (root,
-					    e_table_group_get_type (),
-					    "columns", ecol, TRUE, parent == NULL);
-	group = node_new (group_item, model, parent);
-	
-	for (i = 0; tables [i] != NULL; i++){
-		/*
-		 * Leafs
-		 */
-		if (groups_list [1] == -1){
-			GnomeCanvasItem *item_leaf_header;
-			Node *leaf_header;
-			
-			/* FIXME *//*
-			item_leaf_header = e_table_group_new (
-			GNOME_CANVAS_GROUP (group_item), ecol, TRUE, FALSE);*/
-			leaf_header = node_new (item_leaf_header, tables [i], group);
-
-			e_table_create_leaf (e_table, tables [i], leaf_header);
-		} else {
-			e_table_create_nodes (
-				e_table, tables [i], header, GNOME_CANVAS_GROUP (group_item),
-				group, &groups_list [1]);
-		}
-	}
-
-	return group;
-}
-
-static int *
-group_spec_to_desc (const char *group_spec)
-{
-	int a_size = 10;
-	int *elements;
-	char *p, *copy, *follow;
-	int n_elements = 0;
-
-	if (group_spec == NULL)
-		return NULL;
-
-	elements = g_new (int, a_size);	
-	copy = alloca (strlen (group_spec) + 1);
-	strcpy (copy, group_spec);
-
-	while ((p = strtok_r (copy, ",", &follow)) != NULL){
-		elements [n_elements] = atoi (p);
-		++n_elements;
-		if (n_elements+1 == a_size){
-			int *new_e;
-			
-			n_elements += 10;
-			new_e = g_renew (int, elements, n_elements);
-			if (new_e == NULL){
-				g_free (elements);
-				return NULL;
-			}
-			elements = new_e;
-		}
-		copy = NULL;
-	}
-
-	/* Tag end */
-	elements [n_elements] = -1;
-	
-	return elements;
-}
-
-/*
- * The ETableCanvas object is just used to enable us to
- * hook up to the realize/unrealize phases of the canvas
- * initialization (as laying out the subtables requires us to
- * know the actual size of the subtables we are inserting
- */
- 
-#define E_TABLE_CANVAS_PARENT_TYPE gnome_canvas_get_type ()
-
-typedef struct {
-	GnomeCanvas base;
-
-	ETable *e_table;
-} ETableCanvas;
-
-typedef struct {
-	GnomeCanvasClass base_class;
-} ETableCanvasClass;
-
-static GnomeCanvasClass *e_table_canvas_parent_class;
-
-static void
-e_table_canvas_realize (GtkWidget *widget)
-{
-#if 0
-	GnomeCanvasItem *group_item;
-	
-	group_item = gnome_canvas_item_new (root,
-					    e_table_group_get_type (),
-					    "header", E_TABLE, TRUE, parent == NULL);
-	
-
-	ETableCanvas *e_table_canvas = (ETableCanvas *) widget;
-	ETable *e_table = e_table_canvas->e_table;
-	int *groups;
-	Node *leaf;
-	
-	GTK_WIDGET_CLASS (e_table_canvas_parent_class)->realize (widget);
-	
-	groups = group_spec_to_desc (e_table->group_spec);
-
-	
-
-	leaf = e_table_create_nodes (
-		e_table, e_table->model,
-		e_table->header, GNOME_CANVAS_GROUP (e_table->root), 0, groups);
-
-	
-	if (groups)
-		g_free (groups);
-#endif
-}
-
-static void
-e_table_canvas_unrealize (GtkWidget *widget)
-{
-	ETableCanvas *e_table_canvas = (ETableCanvas *) widget;
-	ETable *e_table = e_table_canvas->e_table;
-	
-	gtk_object_destroy (GTK_OBJECT (e_table->root));
-
-	GTK_WIDGET_CLASS (e_table_canvas_parent_class)->unrealize (widget);
-}
-
-static void
-e_table_canvas_class_init (GtkObjectClass *object_class)
-{
-	GtkWidgetClass *widget_class = (GtkWidgetClass *) object_class;
-
-	widget_class->realize = e_table_canvas_realize;
-	widget_class->unrealize = e_table_canvas_unrealize;
-
-	e_table_canvas_parent_class = gtk_type_class (E_TABLE_CANVAS_PARENT_TYPE);
-}
-
-static void
-e_table_canvas_init (GtkObject *canvas)
-{
-	ETableCanvas *e_table_canvas = (ETableCanvas *) (canvas);
-	ETable *e_table = e_table_canvas->e_table;
-	
-	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
-
-}
-
-GtkType e_table_canvas_get_type (void);
-
-E_MAKE_TYPE (e_table_canvas, "ETableCanvas", ETableCanvas, e_table_canvas_class_init,
-	     e_table_canvas_init, E_TABLE_CANVAS_PARENT_TYPE);
-
-static GnomeCanvas *
-e_table_canvas_new (ETable *e_table)
-{
-	ETableCanvas *e_table_canvas;
-
-	e_table_canvas = gtk_type_new (e_table_canvas_get_type ());
-	e_table_canvas->e_table = e_table;
-	
-	e_table->root = gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (GNOME_CANVAS (e_table_canvas)->root),
-		gnome_canvas_group_get_type (),
-		"x", 0.0,
-		"y", 0.0,
-		NULL);
-
-	return GNOME_CANVAS (e_table_canvas);
-}
-#endif
-
 static void
 table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 			    ETable *e_table)
@@ -663,14 +272,13 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
 				 
 	gtk_widget_show (GTK_WIDGET (e_table->table_canvas));
 	
-	e_table->group = e_table_group_new (GNOME_CANVAS_GROUP (e_table->table_canvas->root),
-					    full_header,
-					    header,
-					    model,
-					    e_table->sort_info,
-					    0);
-	gtk_signal_connect (GTK_OBJECT(e_table->group), "row_selection",
-			   GTK_SIGNAL_FUNC(group_row_selection), e_table);
+	e_table->group = e_table_group_new (
+		GNOME_CANVAS_GROUP (e_table->table_canvas->root),
+		full_header, header,
+		model, e_table->sort_info, 0);
+
+	gtk_signal_connect (GTK_OBJECT (e_table->group), "row_selection",
+			    GTK_SIGNAL_FUNC(group_row_selection), e_table);
 	
 	e_table->table_model_change_id = gtk_signal_connect (
 		GTK_OBJECT (model), "model_changed",
@@ -761,7 +369,7 @@ et_grouping_xml_to_sort_info (ETable *table, xmlNode *grouping)
 				    GTK_SIGNAL_FUNC (sort_info_changed), table);
 }
 
-static void
+static ETable *
 et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 		   xmlDoc *xmlSpec)
 {
@@ -771,21 +379,19 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 	
 	GtkWidget *scrolledwindow;
 
+	xmlRoot = xmlDocGetRootElement (xmlSpec);
+	xmlColumns = e_xml_get_child_by_name (xmlRoot, "columns-shown");
+	xmlGrouping = e_xml_get_child_by_name (xmlRoot, "grouping");
+
+	if ((xmlColumns == NULL) || (xmlGrouping == NULL))
+		return NULL;
+	
 	e_table->full_header = full_header;
 	gtk_object_ref (GTK_OBJECT (full_header));
 
 	e_table->model = etm;
 	gtk_object_ref (GTK_OBJECT (etm));
 
-	xmlRoot = xmlDocGetRootElement (xmlSpec);
-	
-	xmlColumns = e_xml_get_child_by_name (xmlRoot, "columns-shown");
-	xmlGrouping = e_xml_get_child_by_name (xmlRoot, "grouping");
-	
-	/* TODO: unref the etm and full_header, if these things fail? */
-	g_return_if_fail (xmlColumns);
-	g_return_if_fail (xmlGrouping);
-	
 	gtk_widget_push_visual (gdk_rgb_get_visual ());
 	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
 
@@ -796,13 +402,18 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 	e_table_setup_table (e_table, full_header, e_table->header, etm);
 	e_table_fill_table (e_table, etm);
 
-	scrolledwindow = gtk_scrolled_window_new (gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas)),
-						  gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas)));
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
+	scrolledwindow = gtk_scrolled_window_new (
+		gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas)),
+		gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas)));
+	
+	gtk_scrolled_window_set_policy (
+		GTK_SCROLLED_WINDOW (scrolledwindow),
+		GTK_POLICY_NEVER,
+		GTK_POLICY_AUTOMATIC);
 	
-	gtk_container_add (GTK_CONTAINER (scrolledwindow), GTK_WIDGET(e_table->table_canvas));
+	gtk_container_add (
+		GTK_CONTAINER (scrolledwindow),
+		GTK_WIDGET (e_table->table_canvas));
 	gtk_widget_show (scrolledwindow);
 	
 	/*
@@ -825,31 +436,37 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 		
 	gtk_widget_pop_colormap ();
 	gtk_widget_pop_visual ();
+
+	return e_table;
 }
 
-void
-e_table_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
-		   const char *spec)
+ETable *
+e_table_construct (ETable *e_table, ETableHeader *full_header,
+		   ETableModel *etm, const char *spec)
 {
 	xmlDoc *xmlSpec;
 	char *copy;
 	copy = g_strdup (spec);
 
 	xmlSpec = xmlParseMemory (copy, strlen(copy));
-	et_real_construct (e_table, full_header, etm, xmlSpec);
+	e_table = et_real_construct (e_table, full_header, etm, xmlSpec);
 	xmlFreeDoc (xmlSpec);
 	g_free (copy);
+
+	return e_table;
 }
 
-void
+ETable *
 e_table_construct_from_spec_file (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
 				  const char *filename)
 {
 	xmlDoc *xmlSpec;
 
 	xmlSpec = xmlParseFile (filename);
-	et_real_construct (e_table, full_header, etm, xmlSpec);
+	e_table = et_real_construct (e_table, full_header, etm, xmlSpec);
 	xmlFreeDoc (xmlSpec);
+
+	return e_table;
 }
 
 GtkWidget *
@@ -859,9 +476,9 @@ e_table_new (ETableHeader *full_header, ETableModel *etm, const char *spec)
 
 	e_table = gtk_type_new (e_table_get_type ());
 
-	e_table_construct (e_table, full_header, etm, spec);
+	e_table = e_table_construct (e_table, full_header, etm, spec);
 		
-	return (GtkWidget *) e_table;
+	return GTK_WIDGET (e_table);
 }
 
 GtkWidget *
@@ -871,7 +488,7 @@ e_table_new_from_spec_file (ETableHeader *full_header, ETableModel *etm, const c
 
 	e_table = gtk_type_new (e_table_get_type ());
 
-	e_table_construct_from_spec_file (e_table, full_header, etm, filename);
+	e_table = e_table_construct_from_spec_file (e_table, full_header, etm, filename);
 		
 	return (GtkWidget *) e_table;
 }
@@ -900,30 +517,31 @@ et_build_grouping_spec (ETable *e_table)
 {
 	xmlNode *node;
 	xmlNode *grouping;
-	xmlNode *root;
 	int i;
-	int length;
-
-	root = xmlDocGetRootElement (e_table->specification);
-	xmlCopyNode (e_xml_get_child_by_name(root, "grouping"), TRUE);
+	const int sort_count = e_table_sort_info_sorting_get_count (e_table->sort_info);
+	const int group_count = e_table_sort_info_grouping_get_count (e_table->sort_info);
+	
 	grouping = xmlNewNode (NULL, "grouping");
 	node = grouping;
-	length = e_table_sort_info_grouping_get_count(e_table->sort_info);
-	for (i = 0; i < length; i++) {
+
+	for (i = 0; i < group_count; i++) {
 		ETableSortColumn column = e_table_sort_info_grouping_get_nth(e_table->sort_info, i);
 		xmlNode *new_node = xmlNewChild(node, NULL, "group", NULL);
+
 		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
 		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
 		node = new_node;
 	}
-	length = e_table_sort_info_sorting_get_count(e_table->sort_info);
-	for (i = 0; i < length; i++) {
+
+	for (i = 0; i < sort_count; i++) {
 		ETableSortColumn column = e_table_sort_info_sorting_get_nth(e_table->sort_info, i);
 		xmlNode *new_node = xmlNewChild(node, NULL, "leaf", NULL);
+		
 		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
 		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
 		node = new_node;
 	}
+
 	return grouping;
 }
 
@@ -932,27 +550,30 @@ et_build_tree (ETable *e_table)
 {
 	xmlDoc *doc;
 	xmlNode *root;
+
 	doc = xmlNewDoc ("1.0");
 	if (doc == NULL)
 		return NULL;
+	
 	root = xmlNewDocNode (doc, NULL, "ETableSpecification", NULL);
 	xmlDocSetRootElement (doc, root);
-	xmlAddChild (root, et_build_column_spec(e_table));
-	xmlAddChild (root, et_build_grouping_spec(e_table));
+	xmlAddChild (root, et_build_column_spec (e_table));
+	xmlAddChild (root, et_build_grouping_spec (e_table));
+
 	return doc;
 }
 
 gchar *
 e_table_get_specification (ETable *e_table)
 {
-	xmlDoc *doc = et_build_tree (e_table);
+	xmlDoc *doc;
 	xmlChar *buffer;
 	gint size;
 
-	xmlDocDumpMemory (doc,
-			 &buffer,
-			 &size);
+	doc = et_build_tree (e_table);
+	xmlDocDumpMemory (doc, &buffer, &size);
 	xmlFreeDoc (doc);
+
 	return buffer;
 }
 
@@ -965,15 +586,68 @@ e_table_save_specification (ETable *e_table, gchar *filename)
 	xmlFreeDoc (doc);
 }
 
+static void
+et_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+{
+	ETable *etable = E_TABLE (o);
+
+	switch (arg_id){
+	case ARG_TABLE_DRAW_GRID:
+		GTK_VALUE_BOOL (*arg) = etable->draw_grid;
+		break;
+
+	case ARG_TABLE_DRAW_FOCUS:
+		GTK_VALUE_BOOL (*arg) = etable->draw_focus;
+		break;
+	}
+}
+
+typedef struct {
+	char     *arg;
+	gboolean  setting;
+} bool_closure;
 
 static void
+leaf_bool_change (void *etgl, void *closure)
+{
+	bool_closure *bc = closure;
+	
+	gtk_object_set (GTK_OBJECT (etgl), bc->arg, bc->setting, NULL);
+}
+
+static void
+et_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
+{
+	ETable *etable = E_TABLE (o);
+	bool_closure bc;
+	
+	switch (arg_id){
+	case ARG_TABLE_DRAW_GRID:
+		etable->draw_grid = GTK_VALUE_BOOL (*arg);
+		bc.arg = "drawgrid";
+		bc.setting = etable->draw_grid;
+		e_table_group_apply_to_leafs (etable->group, leaf_bool_change, &bc);
+		break;
+
+	case ARG_TABLE_DRAW_FOCUS:
+		etable->draw_focus = GTK_VALUE_BOOL (*arg);
+		bc.arg = "drawfocus";
+		bc.setting = etable->draw_focus;
+		e_table_group_apply_to_leafs (etable->group, leaf_bool_change, &bc);
+		break;
+	}
+}
+	
+static void
 e_table_class_init (GtkObjectClass *object_class)
 {
 	ETableClass *klass = E_TABLE_CLASS(object_class);
 	e_table_parent_class = gtk_type_class (PARENT_TYPE);
 
 	object_class->destroy = et_destroy;
-
+	object_class->set_arg = et_set_arg;
+	object_class->get_arg = et_get_arg;
+	
 	klass->row_selection = NULL;
 
 	et_signals [ROW_SELECTION] =
@@ -985,6 +659,13 @@ e_table_class_init (GtkObjectClass *object_class)
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
 	
 	gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL);
+
+	gtk_object_add_arg_type ("ETable::drawgrid", GTK_TYPE_BOOL,
+				 GTK_ARG_READWRITE, ARG_TABLE_DRAW_GRID);
+	gtk_object_add_arg_type ("ETable::drawfocus", GTK_TYPE_BOOL,
+				 GTK_ARG_READWRITE, ARG_TABLE_DRAW_FOCUS);
+	
+	
 }
 
 E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE);
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index d8c4709621..61fc5a41ae 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -40,17 +40,18 @@ typedef struct {
 
 	GnomeCanvasItem *header_item, *root;
 
-	xmlDoc *specification;
-	
-	guint draw_grid:1;
-	guint draw_focus:1;
-	guint spreadsheet:1;
-	
 	guint need_rebuild:1;
 	guint need_row_changes:1;
 	
 	GHashTable *row_changes_list;
 	gint rebuild_idle_id;
+
+	/*
+	 * Configuration settings
+	 */
+	guint draw_grid:1;
+	guint draw_focus:1;
+	guint spreadsheet:1;
 } ETable;
 
 typedef struct {
@@ -59,19 +60,21 @@ typedef struct {
 	void        (*row_selection)      (ETable *et, int row, gboolean selected);
 } ETableClass;
 
-GtkType    e_table_get_type  (void);
-void       e_table_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
-			      const char *spec);
-GtkWidget *e_table_new       (ETableHeader *full_header, ETableModel *etm,
-			      const char *spec);
+GtkType    e_table_get_type   		    (void);
 
-void       e_table_construct_from_spec_file (ETable *e_table,
+ETable    *e_table_construct  		    (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
+			      		     const char *spec);
+GtkWidget *e_table_new        		    (ETableHeader *full_header, ETableModel *etm,
+			      		     const char *spec);
+
+ETable    *e_table_construct_from_spec_file (ETable *e_table,
 					     ETableHeader *full_header,
 					     ETableModel *etm,
 					     const char *filename);
 GtkWidget *e_table_new_from_spec_file       (ETableHeader *full_header,
 					     ETableModel *etm,
 					     const char *filename);
+
 gchar     *e_table_get_specification        (ETable *e_table);
 void       e_table_save_specification       (ETable *e_table, gchar *filename);
 
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 4f2abffb13..38f690ec43 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -290,9 +290,18 @@ row_selection_test (ETable *table, int row, gboolean selected)
 }
 
 static void
+toggle_grid (void *nothing, ETable *etable)
+{
+	static gboolean shown;
+
+	gtk_object_get (GTK_OBJECT (etable), "drawgrid", &shown, NULL);
+	gtk_object_set (GTK_OBJECT (etable), "drawgrid", !shown, NULL);
+}
+
+static void
 do_e_table_demo (const char *spec)
 {
-	GtkWidget *e_table, *window, *frame, *vbox, *button;
+	GtkWidget *e_table, *window, *frame, *vbox, *button, *bhide;
 	ECell *cell_left_just;
 	ETableHeader *full_header;
 	int i;
@@ -328,23 +337,26 @@ do_e_table_demo (const char *spec)
 	gtk_signal_connect (GTK_OBJECT(e_table), "row_selection",
 			   GTK_SIGNAL_FUNC(row_selection_test), NULL);
 
-	button = gtk_button_new_with_label ("Save spec");
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (save_spec), e_table);
-
 	vbox = gtk_vbox_new (FALSE, 0);
-	
 	gtk_box_pack_start (GTK_BOX (vbox), e_table, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (frame), vbox);
 	gtk_container_add (GTK_CONTAINER (window), frame);
 
+	/*
+	 * gadgets
+	 */
+	button = gtk_button_new_with_label ("Save spec");
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			    GTK_SIGNAL_FUNC (save_spec), e_table);
+	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+	bhide = gtk_button_new_with_label ("Toggle Grid");
+	gtk_signal_connect (GTK_OBJECT (bhide), "clicked",
+			    GTK_SIGNAL_FUNC (toggle_grid), e_table);
+	gtk_box_pack_start (GTK_BOX (vbox), bhide, FALSE, FALSE, 0);
+
 	gtk_widget_set_usize (window, 200, 200);
-	gtk_widget_show (e_table);
-	gtk_widget_show (button);
-	gtk_widget_show (vbox);
-	gtk_widget_show (frame);
-	gtk_widget_show (window);
+	gtk_widget_show_all (window);
 
 	if (getenv ("TEST")){
 		e_table_do_gui_config (NULL, E_TABLE(e_table));