Changed to take into account the sort group, if the table has one.x

2000-10-04  Not Zed  <NotZed@HelixCode.com>

        * e-table-sorted-variable.c (etsv_add): Changed to take into
        account the sort group, if the table has one.x
        (etsv_insert_idle): Clear the insert count if we hit an idle loop.
        (etsv_sort_idle): Reset the insert count if we perform a sort.
        (etsv_add): If we are adding a lot (>ETSV_INSERT_MAX) items,
        without hitting an idle loop, assume we're better off performing a
        sort instead.  Use another idle handler to reset the count.

2000-10-03  Not Zed  <NotZed@HelixCode.com>

        * e-table-sorted-variable.c (etsv_sort_by_group): Sort based on
        the sort_group stuff.

        * e-tree-model.c (e_tree_init): Setup the group sort info string.
        (etree_destroy): And free it.
        (build_sort_group): Build a string for this node.

2000-09-29  Not Zed  <NotZed@HelixCode.com>

        * e-cell-tree.c (e_cell_tree_get_node): Changed to take the source
        model, not the tree model.  The source model may be a subset, and
        it needs to remap the rows for us.
        (ect_draw):
        (ect_event):
        (ect_max_width):
        (ect_print): Changed callers.

        * e-table-sorted-variable.c (etsv_sort_subset):
        (etsv_sort_build_subset):
        (etsv_sort_free_subset): Functions to perfom grouping of sorts for
        sorts that have row_sort_group returning useful info.
        (etsv_sort): Use the complex sort routines if we need to.

        * e-table-model.c (e_table_model_row_sort_group): Return a sort-id
        for a given row.
        (e_table_model_has_sort_group): Return if the sort-id provides any
        useful information.

svn path=/trunk/; revision=5705

1 files changed, 7 insertions, 7 deletions

diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 0d159ded19..bae0ecaa8d 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -63,9 +63,9 @@ offset_of_node (ETreeModel *tree_model, ETreePath *path)
 }
 
 static ETreePath*
-e_cell_tree_get_node (ETreeModel *tree_model, int row)
+e_cell_tree_get_node (ETableModel *table_model, int row)
 {
-	return (ETreePath*)e_table_model_value_at (E_TABLE_MODEL(tree_model), -1, row);
+	return (ETreePath*)e_table_model_value_at (table_model, -1, row);
 }
 
 static ETreeModel*
@@ -177,7 +177,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		int node_image_width = 0, node_image_height = 0;
 		ETreePath *parent_node;
 
-		node = e_cell_tree_get_node (tree_model, row);
+		node = e_cell_tree_get_node (ecell_view->e_table_model, row);
 
 		offset = offset_of_node (tree_model, node);
 		expandable = e_tree_model_node_is_expandable (tree_model, node);
@@ -304,7 +304,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col,
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-	ETreePath *node = e_cell_tree_get_node (tree_model, row);
+	ETreePath *node = e_cell_tree_get_node (ecell_view->e_table_model, row);
 	int offset = offset_of_node (tree_model, node);
 
 	switch (event->type) {
@@ -378,7 +378,7 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col)
 		int offset, subcell_offset;
 		gboolean expanded, expandable;
 		
-		node = e_cell_tree_get_node (tree_model, row);
+		node = e_cell_tree_get_node (ecell_view->e_table_model, row);
 		
 		offset = offset_of_node (tree_model, node);
 		expandable = e_tree_model_node_is_expandable (tree_model, node);
@@ -422,7 +422,7 @@ ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row,
 {		
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-	ETreePath *node = e_cell_tree_get_node (tree_model, row);
+	ETreePath *node = e_cell_tree_get_node (ecell_view->e_table_model, row);
 	int offset = offset_of_node (tree_model, node);
 	GdkPixbuf *node_image;
 
@@ -471,7 +471,7 @@ ect_print (ECellView *ecell_view, GnomePrintContext *context,
 
 	if (/* XXX only if we're the active sort */ TRUE) {
 		ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-		ETreePath *node = e_cell_tree_get_node (tree_model, row);
+		ETreePath *node = e_cell_tree_get_node (ecell_view->e_table_model, row);
 		int offset = offset_of_node (tree_model, node);
 		int subcell_offset = offset;
 		gboolean expandable = e_tree_model_node_is_expandable (tree_model, node);