From beaba6a43c287ceeaee0cb05c1a1b48604cd8cc5 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 24 Oct 2001 18:36:50 +0000 Subject: more changes in an attempt to get it right. It's not yet ready for general Wed Oct 24 20:29:47 2001 Kristian Rietveld * gtk/gtktreemodelsort.c: more changes in an attempt to get it right. It's not yet ready for general consumption. * tests/treestoretest.c: add a button and entry for the new iter_change function (iter_change): new function, to test the row_changed signal implementation of the GtkTreeModelSort * tests/testtreesort.c: cleanups, changes to test more features of the GtkTreeModelSort at once --- tests/testtreesort.c | 383 ++++++++++++++++++++++++++------------------------- 1 file changed, 194 insertions(+), 189 deletions(-) (limited to 'tests/testtreesort.c') diff --git a/tests/testtreesort.c b/tests/testtreesort.c index 69bceb1be..33313311c 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -57,12 +57,12 @@ main (int argc, char *argv[]) GtkWidget *scrolled_window; GtkWidget *tree_view; GtkTreeStore *model; - GtkTreeModel *smodel; + GtkTreeModel *smodel = NULL; GtkTreeModel *ssmodel = NULL; GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkTreeIter iter; - gint i, j; + gint i; GtkWidget *window2, *vbox2, *scrolled_window2, *tree_view2; GtkWidget *window3, *vbox3, *scrolled_window3, *tree_view3; @@ -87,40 +87,43 @@ main (int argc, char *argv[]) gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0); model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + +/* smodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (model)); ssmodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (smodel)); - +*/ tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - for (j = 0; j < 2; j++) - for (i = 0; data[i].word_1 != NULL; i++) - { - gint k; - - gtk_tree_store_prepend (GTK_TREE_STORE (model), &iter, NULL); - gtk_tree_store_set (GTK_TREE_STORE (model), &iter, - WORD_COLUMN_1, data[i].word_1, - WORD_COLUMN_2, data[i].word_2, - WORD_COLUMN_3, data[i].word_3, - WORD_COLUMN_4, data[i].word_4, - -1); - for (k = 0; childdata[k].word_1 != NULL; k++) - { - GtkTreeIter child_iter; - - gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter); - gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter, - WORD_COLUMN_1, childdata[k].word_1, - WORD_COLUMN_2, childdata[k].word_2, - WORD_COLUMN_3, childdata[k].word_3, - WORD_COLUMN_4, childdata[k].word_4, - -1); - } - } -/* + /* 12 iters now, 12 later... */ + for (i = 0; data[i].word_1 != NULL; i++) + { + gint k; + + gtk_tree_store_prepend (GTK_TREE_STORE (model), &iter, NULL); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, + WORD_COLUMN_1, data[i].word_1, + WORD_COLUMN_2, data[i].word_2, + WORD_COLUMN_3, data[i].word_3, + WORD_COLUMN_4, data[i].word_4, + -1); + + for (k = 0; childdata[k].word_1 != NULL; k++) + { + GtkTreeIter child_iter; + + gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter); + gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter, + WORD_COLUMN_1, childdata[k].word_1, + WORD_COLUMN_2, childdata[k].word_2, + WORD_COLUMN_3, childdata[k].word_3, + WORD_COLUMN_4, childdata[k].word_4, + -1); + } + } + smodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (model)); ssmodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (smodel)); -*/ + g_object_unref (G_OBJECT (model)); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE); @@ -152,11 +155,11 @@ main (int argc, char *argv[]) gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_4); gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column); -/* + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (smodel), WORD_COLUMN_1, GTK_SORT_ASCENDING); - */ + gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); gtk_window_set_default_size (GTK_WINDOW (window), 400, 400); gtk_widget_show_all (window); @@ -166,167 +169,169 @@ main (int argc, char *argv[]) * Second window - GtkTreeModelSort wrapping the GtkTreeStore */ - window2 = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window2), - "Words, words, words - window 2"); - gtk_signal_connect (GTK_OBJECT (window2), "destroy", gtk_main_quit, NULL); - vbox2 = gtk_vbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8); - gtk_box_pack_start (GTK_BOX (vbox2), - gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"), - FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER (window2), vbox2); - - scrolled_window2 = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window2), - GTK_SHADOW_ETCHED_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE, TRUE, 0); - - - tree_view2 = gtk_tree_view_new_with_model (smodel); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view2), TRUE); - - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("First Word", renderer, - "text", WORD_COLUMN_1, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_1); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Second Word", renderer, - "text", WORD_COLUMN_2, - NULL); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_2); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Third Word", renderer, - "text", WORD_COLUMN_3, - NULL); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_3); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Fourth Word", renderer, - "text", WORD_COLUMN_4, - NULL); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_4); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); - - gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (smodel), - (GtkTreeIterCompareFunc)gtk_tree_data_list_compare_func, - NULL, NULL); -/* - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (smodel), - WORD_COLUMN_1, - GTK_SORT_DESCENDING); - */ - - gtk_container_add (GTK_CONTAINER (scrolled_window2), tree_view2); - gtk_window_set_default_size (GTK_WINDOW (window2), 400, 400); - gtk_widget_show_all (window2); - + if (smodel) + { + window2 = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (window2), + "Words, words, words - window 2"); + gtk_signal_connect (GTK_OBJECT (window2), "destroy", gtk_main_quit, NULL); + vbox2 = gtk_vbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8); + gtk_box_pack_start (GTK_BOX (vbox2), + gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"), + FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (window2), vbox2); + + scrolled_window2 = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window2), + GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE, TRUE, 0); + + + tree_view2 = gtk_tree_view_new_with_model (smodel); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view2), TRUE); + + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("First Word", renderer, + "text", WORD_COLUMN_1, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_1); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Second Word", renderer, + "text", WORD_COLUMN_2, + NULL); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_2); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Third Word", renderer, + "text", WORD_COLUMN_3, + NULL); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_3); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Fourth Word", renderer, + "text", WORD_COLUMN_4, + NULL); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_4); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column); + + gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (smodel), + (GtkTreeIterCompareFunc)gtk_tree_data_list_compare_func, + NULL, NULL); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (smodel), + WORD_COLUMN_1, + GTK_SORT_DESCENDING); + + gtk_container_add (GTK_CONTAINER (scrolled_window2), tree_view2); + gtk_window_set_default_size (GTK_WINDOW (window2), 400, 400); + gtk_widget_show_all (window2); + } + /** * Third window - GtkTreeModelSort wrapping the GtkTreeModelSort which * is wrapping the GtkTreeStore. */ - - if (ssmodel) { - window3 = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window3), - "Words, words, words - Window 3"); - gtk_signal_connect (GTK_OBJECT (window3), "destroy", gtk_main_quit, NULL); - vbox3 = gtk_vbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8); - gtk_box_pack_start (GTK_BOX (vbox3), - gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"), - FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER (window3), vbox3); - - scrolled_window3 = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window3), - GTK_SHADOW_ETCHED_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE, TRUE, 0); - - - tree_view3 = gtk_tree_view_new_with_model (ssmodel); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view3), TRUE); - - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("First Word", renderer, - "text", WORD_COLUMN_1, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_1); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Second Word", renderer, - "text", WORD_COLUMN_2, - NULL); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_2); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Third Word", renderer, - "text", WORD_COLUMN_3, - NULL); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_3); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Fourth Word", renderer, - "text", WORD_COLUMN_4, - NULL); - gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_4); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); -/* - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (ssmodel), - WORD_COLUMN_1, - GTK_SORT_ASCENDING); -*/ - gtk_container_add (GTK_CONTAINER (scrolled_window3), tree_view3); - gtk_window_set_default_size (GTK_WINDOW (window3), 400, 400); - gtk_widget_show_all (window3); - } - -/* - for (j = 0; j < 2; j++) - for (i = 0; data[i].word_1 != NULL; i++) - { - gint k; - - gtk_tree_store_prepend (GTK_TREE_STORE (model), &iter, NULL); - gtk_tree_store_set (GTK_TREE_STORE (model), &iter, - WORD_COLUMN_1, data[i].word_1, - WORD_COLUMN_2, data[i].word_2, - WORD_COLUMN_3, data[i].word_3, - WORD_COLUMN_4, data[i].word_4, - -1); - - for (k = 0; childdata[k].word_1 != NULL; k++) - { - GtkTreeIter child_iter; - - gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter); - gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter, - WORD_COLUMN_1, childdata[k].word_1, - WORD_COLUMN_2, childdata[k].word_2, - WORD_COLUMN_3, childdata[k].word_3, - WORD_COLUMN_4, childdata[k].word_4, - -1); - } - } -*/ + + if (ssmodel) + { + window3 = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (window3), + "Words, words, words - Window 3"); + gtk_signal_connect (GTK_OBJECT (window3), "destroy", gtk_main_quit, NULL); + vbox3 = gtk_vbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8); + gtk_box_pack_start (GTK_BOX (vbox3), + gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"), + FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (window3), vbox3); + + scrolled_window3 = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window3), + GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE, TRUE, 0); + + + tree_view3 = gtk_tree_view_new_with_model (ssmodel); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view3), TRUE); + + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("First Word", renderer, + "text", WORD_COLUMN_1, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_1); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Second Word", renderer, + "text", WORD_COLUMN_2, + NULL); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_2); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Third Word", renderer, + "text", WORD_COLUMN_3, + NULL); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_3); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Fourth Word", renderer, + "text", WORD_COLUMN_4, + NULL); + gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_4); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column); + + gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (ssmodel), + (GtkTreeIterCompareFunc)gtk_tree_data_list_compare_func, + NULL, NULL); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (ssmodel), + WORD_COLUMN_1, + GTK_SORT_ASCENDING); + + gtk_container_add (GTK_CONTAINER (scrolled_window3), tree_view3); + gtk_window_set_default_size (GTK_WINDOW (window3), 400, 400); + gtk_widget_show_all (window3); + } + + for (i = 0; data[i].word_1 != NULL; i++) + { + gint k; + + gtk_tree_store_prepend (GTK_TREE_STORE (model), &iter, NULL); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, + WORD_COLUMN_1, data[i].word_1, + WORD_COLUMN_2, data[i].word_2, + WORD_COLUMN_3, data[i].word_3, + WORD_COLUMN_4, data[i].word_4, + -1); + for (k = 0; childdata[k].word_1 != NULL; k++) + { + GtkTreeIter child_iter; + + gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter); + gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter, + WORD_COLUMN_1, childdata[k].word_1, + WORD_COLUMN_2, childdata[k].word_2, + WORD_COLUMN_3, childdata[k].word_3, + WORD_COLUMN_4, childdata[k].word_4, + -1); + } + } + gtk_main (); - + return 0; } -- cgit v1.2.1