From 29a313c41efa7844952000a88d772af11fbb6f37 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 23 Jun 2000 07:19:11 +0000 Subject: use the expanded/unexpanded pixbufs as node pixbufs for the first level of 2000-06-23 Chris Toshok * e-tree-example-1.c (create_tree): use the expanded/unexpanded pixbufs as node pixbufs for the first level of children, to test the drawing. * e-tree-model.c (e_tree_model_node_get_closed_pixbuf): new function. (e_tree_model_node_get_opened_pixbuf): same. (e_tree_model_node_insert): add opened/closed pixbuf argument. (e_tree_model_node_insert_before): same. * e-tree-model.h: add prototypes for opened/closed pixbuf accessors, and add them to the e_tree_model_node_insert_* calls. * e-cell-tree.c (ect_draw): add opened/closed pixbuf drawing per node. svn path=/trunk/; revision=3706 --- widgets/e-table/e-tree-example-1.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'widgets/e-table/e-tree-example-1.c') diff --git a/widgets/e-table/e-tree-example-1.c b/widgets/e-table/e-tree-example-1.c index 688bc735b1..c506faebd5 100644 --- a/widgets/e-table/e-tree-example-1.c +++ b/widgets/e-table/e-tree-example-1.c @@ -20,6 +20,8 @@ #include "tree-expanded.xpm" #include "tree-unexpanded.xpm" +GdkPixbuf *tree_expanded_pixbuf; +GdkPixbuf *tree_unexpanded_pixbuf; #define COLS 4 @@ -127,7 +129,9 @@ add_sibling (GtkButton *button, gpointer data) parent_node = e_tree_model_node_get_parent (e_tree_model, selected_node); e_tree_model_node_insert_before (e_tree_model, parent_node, - selected_node, g_strdup("User added sibling")); + selected_node, + NULL, NULL, + g_strdup("User added sibling")); } @@ -146,7 +150,8 @@ add_child (GtkButton *button, gpointer data) g_assert (selected_node); e_tree_model_node_insert (e_tree_model, selected_node, - 0, g_strdup("User added child")); + 0, NULL, NULL, + g_strdup("User added child")); } static void @@ -224,7 +229,6 @@ static void create_tree (void) { GtkWidget *window, *frame, *button, *vbox; - GdkPixbuf *tree_expanded_pixbuf, *tree_unexpanded_pixbuf; ECell *cell_left_just; ECell *cell_tree; ETableHeader *e_table_header; @@ -241,14 +245,19 @@ create_tree (void) /* create a root node with 5 children */ root_node = e_tree_model_node_insert (e_tree_model, NULL, - 0, g_strdup("Root Node")); + 0, NULL, NULL, + g_strdup("Root Node")); for (i = 0; i < 5; i++){ ETreePath *n = e_tree_model_node_insert (e_tree_model, - root_node, 0, g_strdup("First level of children")); + root_node, 0, + tree_expanded_pixbuf, tree_unexpanded_pixbuf, + g_strdup("First level of children")); for (j = 0; j < 5; j ++) { e_tree_model_node_insert (e_tree_model, - n, 0, g_strdup("Second level of children")); + n, 0, + NULL, NULL, + g_strdup("Second level of children")); } } @@ -273,12 +282,6 @@ create_tree (void) */ cell_left_just = e_cell_text_new (E_TABLE_MODEL(e_tree_model), NULL, GTK_JUSTIFY_LEFT); - /* - * Create our pixbuf for expanding/unexpanding - */ - tree_expanded_pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)tree_expanded_xpm); - tree_unexpanded_pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)tree_unexpanded_xpm); - /* * This renderer is used for the tree column (the leftmost one), and * has as its subcell renderer the text renderer. this means that @@ -377,6 +380,12 @@ main (int argc, char *argv []) gtk_widget_push_visual (gdk_rgb_get_visual ()); gtk_widget_push_colormap (gdk_rgb_get_cmap ()); + /* + * Create our pixbuf for expanding/unexpanding + */ + tree_expanded_pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)tree_expanded_xpm); + tree_unexpanded_pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)tree_unexpanded_xpm); + create_tree (); gtk_main (); -- cgit v1.2.3