From 58eba683f83f3b6e2ca023c34e6eae647d929409 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 4 Oct 2000 15:51:35 +0000 Subject: Changed to take into account the sort group, if the table has one.x 2000-10-04 Not Zed * 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 * 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 * 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 --- widgets/table/e-tree-model.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'widgets/table/e-tree-model.c') diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index d5b69656d5..7687b5b185 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -72,6 +72,7 @@ etree_destroy (GtkObject *object) g_hash_table_foreach_remove (etree->expanded_state, expanded_remove_func, NULL); + g_string_free(etree->sort_group, TRUE); GTK_OBJECT_CLASS (e_tree_model_parent_class)->destroy (object); } @@ -347,6 +348,38 @@ etable_is_cell_editable (ETableModel *etm, int col, int row) return et_class->is_editable (etree, node, col); } +static void +build_sort_group(GString *out, ETreePath *node) +{ + if (node->parent) { + build_sort_group(out, node->parent); + } + g_string_sprintfa(out, "/%p", node); +} + +static const char * +etable_row_sort_group(ETableModel *etm, int row) +{ + ETreeModel *etree = E_TREE_MODEL(etm); + ETreeModelClass *et_class = ETM_CLASS(etm); + ETreePath* node = e_tree_model_node_at_row (etree, row); + + g_return_val_if_fail (node, ""); + + g_string_truncate(etree->sort_group, 0); + if (node) + build_sort_group(etree->sort_group, node); + + return etree->sort_group->str; +} + +static gboolean +etable_has_sort_group(ETableModel *etm) +{ + /* could optimise for the flat &/or unexpanded tree case */ + return TRUE; +} + static void e_tree_model_class_init (GtkObjectClass *klass) @@ -414,6 +447,9 @@ e_tree_model_class_init (GtkObjectClass *klass) table_class->thaw = etable_thaw; #endif + table_class->row_sort_group = etable_row_sort_group; + table_class->has_sort_group = etable_has_sort_group; + tree_class->get_root = etree_get_root; tree_class->get_prev = etree_get_prev; tree_class->get_next = etree_get_next; @@ -432,7 +468,15 @@ e_tree_model_class_init (GtkObjectClass *klass) tree_class->node_at_row = etree_node_at_row; } -E_MAKE_TYPE(e_tree_model, "ETreeModel", ETreeModel, e_tree_model_class_init, NULL, PARENT_TYPE) +static void +e_tree_init (GtkObject *object) +{ + ETreeModel *etree = (ETreeModel *)object; + + etree->sort_group = g_string_new(""); +} + +E_MAKE_TYPE(e_tree_model, "ETreeModel", ETreeModel, e_tree_model_class_init, e_tree_init, PARENT_TYPE) /* signals */ -- cgit v1.2.3