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, 35 insertions, 6 deletions

diff --git a/widgets/e-table/e-table-subset.c b/widgets/e-table/e-table-subset.c
index a09d221980..b4473b87ef 100644
--- a/widgets/e-table/e-table-subset.c
+++ b/widgets/e-table/e-table-subset.c
@@ -25,6 +25,17 @@ etss_destroy (GtkObject *object)
 	if (etss->source)
 		gtk_object_unref (GTK_OBJECT (etss->source));
 
+	gtk_signal_disconnect (GTK_OBJECT (etss->source),
+			       etss->table_model_changed_id);
+	gtk_signal_disconnect (GTK_OBJECT (etss->source),
+			       etss->table_model_row_changed_id);
+	gtk_signal_disconnect (GTK_OBJECT (etss->source),
+			       etss->table_model_cell_changed_id);
+
+	etss->table_model_changed_id = 0;
+	etss->table_model_row_changed_id = 0;
+	etss->table_model_cell_changed_id = 0;
+
 	if (etss->map_table)
 		free (etss->map_table);
 
@@ -71,6 +82,22 @@ etss_is_cell_editable (ETableModel *etm, int col, int row)
 	return e_table_model_is_cell_editable (etss->source, col, etss->map_table [row]);
 }
 
+static void *
+etss_duplicate_value (ETableModel *etm, int col, const void *value)
+{
+	ETableSubset *etss = (ETableSubset *)etm;
+
+	return e_table_model_duplicate_value (etss->source, col, value);
+}
+
+static void
+etss_free_value (ETableModel *etm, int col, void *value)
+{
+	ETableSubset *etss = (ETableSubset *)etm;
+
+	e_table_model_free_value (etss->source, col, value);
+}
+
 static void
 etss_thaw (ETableModel *etm)
 {
@@ -91,6 +118,8 @@ etss_class_init (GtkObjectClass *klass)
 	table_class->value_at         = etss_value_at;
 	table_class->set_value_at     = etss_set_value_at;
 	table_class->is_cell_editable = etss_is_cell_editable;
+	table_class->duplicate_value  = etss_duplicate_value;
+	table_class->free_value       = etss_free_value;
 	table_class->thaw             = etss_thaw;
 }
 
@@ -155,12 +184,12 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, int nvals)
 	for (i = 0; i < nvals; i++)
 		etss->map_table [i] = i;
 
-	gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-			    GTK_SIGNAL_FUNC (etss_proxy_model_changed), etss);
-	gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-			    GTK_SIGNAL_FUNC (etss_proxy_model_row_changed), etss);
-	gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-			    GTK_SIGNAL_FUNC (etss_proxy_model_cell_changed), etss);
+	etss->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
+						     GTK_SIGNAL_FUNC (etss_proxy_model_changed), etss);
+	etss->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
+							 GTK_SIGNAL_FUNC (etss_proxy_model_row_changed), etss);
+	etss->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
+							  GTK_SIGNAL_FUNC (etss_proxy_model_cell_changed), etss);
 	
 	return E_TABLE_MODEL (etss);
 }