Added duplicate_value and add_value. Use the new compare functions. Made

2000-02-24  Christopher James Lahey  <clahey@helixcode.com>

        * test-table.c: Added duplicate_value and add_value.  Use the new
        compare functions.  Made it so we only create one model to better
        test model view stuff.  Changed the test to not have as many
        extra, useless, columns.

        * test-cols.c, test-check.c: Added duplicate_value and add_value.  Use the new
        compare functions.

        * e-table.c, e-table.h: Use all the new features of e-table-groups
        (sorting and grouping).  Handle on the fly reorganization of
        groups in an idle loop.  Compare functions now are to return -1 if
        the first item is greater, 0 if they are equal, or 1 if the second
        item is greater.

        * e-table-subset.c, e-table-subset.h: Made e-table-subset
        disconnect properly from its signals when it dies.

        * e-table-subset-variable.c, e-table-subset-variable.h:
        Virtualized the add and remove commands so that
        e_table_sorted_variable could override the add command to do sorting.

        * e-table-sorted.c: Fixed this to inherit properly from
        ETableSubset.

        * e-table-simple.h, e-table-simple.c: Added handling of
        duplicate_value and free_value;

        * e-table-model.c, e-table-model.h: Added duplicate_value and
        free_value for memory allocation of table elements outside the
        table.

        * e-table-item.c: Fixed a crashing bug.

        * e-table-group.c: Added sorting.  Fixed destruction to delete the
        right things.

        * e-table-group-leaf.c, e-table-group-leaf.h: Pass column and sort
        order information into the e_table_sorted_variable.  Properly
        destroy things when deleted.

        * e-table-group-container.c, e-table-group-container.h: Properly
        handle the list of subgroups.  Handle proper sorting and grouping
        of subgroups.

        * e-table-sorted-variable.c, e-table-sorted-variable.h: Files to
        do a sorted model that stays sorted as you add and remove rows.

        * Makefile.am: Added e-table-sorted-variable.c and
        e-table-sorted-variable.h.

svn path=/trunk/; revision=1930

1 files changed, 30 insertions, 9 deletions

diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 1f4e2037cd..6ae8a25db7 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -17,6 +17,7 @@
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <gnome-xml/parser.h>
 #include "e-util/e-util.h"
+#include "e-util/e-xml-utils.h"
 
 #define TITLE_HEIGHT         16
 #define GROUP_INDENT         10
@@ -45,7 +46,7 @@ enum {
 static void etg_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
 static void etg_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
 static gboolean etg_get_focus (ETableGroup      *etg);
-
+static void etg_destroy (GtkObject *object);
 #if 0
 GnomeCanvasItem *
 e_table_group_new (GnomeCanvasGroup *parent, ETableCol *ecol, 
@@ -64,6 +65,17 @@ e_table_group_new (GnomeCanvasGroup *parent, ETableCol *ecol,
 }
 #endif
 
+static void
+etg_destroy (GtkObject *object)
+{
+	ETableGroup *etg = E_TABLE_GROUP(object);
+	gtk_object_unref(GTK_OBJECT(etg->header));
+	gtk_object_unref(GTK_OBJECT(etg->full_header));
+	gtk_object_unref(GTK_OBJECT(etg->model));
+	if ( GTK_OBJECT_CLASS (etg_parent_class)->destroy )
+		GTK_OBJECT_CLASS (etg_parent_class)->destroy (object);
+}
+
 ETableGroup *
 e_table_group_new (GnomeCanvasGroup *parent,
 		   ETableHeader     *full_header,
@@ -71,17 +83,22 @@ e_table_group_new (GnomeCanvasGroup *parent,
 		   ETableModel      *model,
 		   xmlNode          *rules)
 {
+	int column;
+	int ascending;
+
 	g_return_val_if_fail (model != NULL, NULL);
-	
+
+	column = e_xml_get_integer_prop_by_name(rules, "column");
+	ascending = e_xml_get_integer_prop_by_name(rules, "ascending");
+
 	if(rules && !xmlStrcmp(rules->name, "group")) {
-		gint col_idx = atoi(xmlGetProp(rules, "column"));
 		ETableCol *col;
-		if ( col_idx > e_table_header_count(full_header) )
-			return e_table_group_leaf_new(parent, full_header, header, model);
-		col = e_table_header_get_columns(full_header)[col_idx];
-		return e_table_group_container_new(parent, full_header, header, model, col, rules->childs);
+		if ( column > e_table_header_count(full_header) )
+			return e_table_group_leaf_new(parent, full_header, header, model, column, ascending);
+		col = e_table_header_get_columns(full_header)[column];
+		return e_table_group_container_new(parent, full_header, header, model, col, ascending, rules->childs);
 	} else {
-		return e_table_group_leaf_new(parent, full_header, header, model);
+		return e_table_group_leaf_new(parent, full_header, header, model, column, ascending);
 	}
 	return NULL;
 }
@@ -93,10 +110,13 @@ e_table_group_construct (GnomeCanvasGroup *parent,
 			 ETableHeader     *header,
 			 ETableModel      *model)
 {
-	gnome_canvas_item_constructv (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
 	etg->full_header = full_header;
+	gtk_object_ref(GTK_OBJECT(etg->full_header));
 	etg->header = header;
+	gtk_object_ref(GTK_OBJECT(etg->header));
 	etg->model = model;
+	gtk_object_ref(GTK_OBJECT(etg->model));
+	gnome_canvas_item_constructv (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
 }
 
 void
@@ -311,6 +331,7 @@ etg_class_init (GtkObjectClass *object_class)
 	
 	object_class->set_arg = etg_set_arg;
 	object_class->get_arg = etg_get_arg;
+	object_class->destroy = etg_destroy;
 
 	item_class->event = etg_event;