diff options
| -rw-r--r-- | widgets/e-table/ChangeLog | 13 | ||||
| -rw-r--r-- | widgets/e-table/Makefile.am | 4 | ||||
| -rw-r--r-- | widgets/e-table/e-tree-example-1.c | 7 | ||||
| -rw-r--r-- | widgets/e-table/tree-expanded.xpm | 22 | ||||
| -rw-r--r-- | widgets/e-table/tree-unexpanded.xpm | 22 | ||||
| -rw-r--r-- | widgets/table/e-tree-example-1.c | 7 | ||||
| -rw-r--r-- | widgets/table/tree-expanded.xpm | 22 | ||||
| -rw-r--r-- | widgets/table/tree-unexpanded.xpm | 22 |
8 files changed, 18 insertions, 101 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 8429e2fabf..36725bb8be 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,16 @@ +2000-08-22 Chris Toshok <toshok@helixcode.com> + + * Makefile.am (icons): remove tree-expanded.xpm and + tree-unexpanded.xpm. + + * e-tree-example-1.c: use art/tree-expanded.xpm and + art/tree-unexpanded.xpm. + (remove_node): commit the change listed below (08-21). + + * tree-expanded.xpm: removed. + + * tree-unexpanded.xpm: removed. + 2000-08-21 Lauris Kaplinski <lauris@helixcode.com> * e-cell-text.c (ect_event): Use e_utf8_from_gtk_event_key to translate diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am index 30ee6f3d7d..14bab7e2f4 100644 --- a/widgets/e-table/Makefile.am +++ b/widgets/e-table/Makefile.am @@ -169,9 +169,7 @@ icons = \ add-col.xpm \ check-empty.xpm \ check-filled.xpm \ - remove-col.xpm \ - tree-expanded.xpm \ - tree-unexpanded.xpm + remove-col.xpm EXTRA_DIST = \ sample.table \ diff --git a/widgets/e-table/e-tree-example-1.c b/widgets/e-table/e-tree-example-1.c index 308f462f64..3762dc6b39 100644 --- a/widgets/e-table/e-tree-example-1.c +++ b/widgets/e-table/e-tree-example-1.c @@ -17,8 +17,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> -#include "tree-expanded.xpm" -#include "tree-unexpanded.xpm" +#include "art/tree-expanded.xpm" +#include "art/tree-unexpanded.xpm" GdkPixbuf *tree_expanded_pixbuf; GdkPixbuf *tree_unexpanded_pixbuf; @@ -177,9 +177,6 @@ remove_node (GtkButton *button, gpointer data) selected_node = e_tree_model_node_at_row (e_tree_model, selected_row); g_assert (selected_node); - if (e_tree_model_node_get_children (e_tree_model, selected_node, NULL) > 0) - return; - str = (char*)e_tree_model_node_remove (e_tree_model, selected_node); printf ("removed node %s\n", str); g_free (str); diff --git a/widgets/e-table/tree-expanded.xpm b/widgets/e-table/tree-expanded.xpm deleted file mode 100644 index fc748953eb..0000000000 --- a/widgets/e-table/tree-expanded.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * tree_expanded_xpm[] = { -"16 16 3 1", -" c None", -". c #000000", -"+ c #FFFFFF", -" ", -" ", -" ", -" ", -" ......... ", -" .+++++++. ", -" .+++++++. ", -" .+++++++. ", -" .+.....+. ", -" .+++++++. ", -" .+++++++. ", -" .+++++++. ", -" ......... ", -" ", -" ", -" "}; diff --git a/widgets/e-table/tree-unexpanded.xpm b/widgets/e-table/tree-unexpanded.xpm deleted file mode 100644 index 0dfb12a0a5..0000000000 --- a/widgets/e-table/tree-unexpanded.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * tree_unexpanded_xpm[] = { -"16 16 3 1", -" c None", -". c #000000", -"+ c #FFFFFF", -" ", -" ", -" ", -" ", -" ......... ", -" .+++++++. ", -" .+++.+++. ", -" .+++.+++. ", -" .+.....+. ", -" .+++.+++. ", -" .+++.+++. ", -" .+++++++. ", -" ......... ", -" ", -" ", -" "}; diff --git a/widgets/table/e-tree-example-1.c b/widgets/table/e-tree-example-1.c index 308f462f64..3762dc6b39 100644 --- a/widgets/table/e-tree-example-1.c +++ b/widgets/table/e-tree-example-1.c @@ -17,8 +17,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> -#include "tree-expanded.xpm" -#include "tree-unexpanded.xpm" +#include "art/tree-expanded.xpm" +#include "art/tree-unexpanded.xpm" GdkPixbuf *tree_expanded_pixbuf; GdkPixbuf *tree_unexpanded_pixbuf; @@ -177,9 +177,6 @@ remove_node (GtkButton *button, gpointer data) selected_node = e_tree_model_node_at_row (e_tree_model, selected_row); g_assert (selected_node); - if (e_tree_model_node_get_children (e_tree_model, selected_node, NULL) > 0) - return; - str = (char*)e_tree_model_node_remove (e_tree_model, selected_node); printf ("removed node %s\n", str); g_free (str); diff --git a/widgets/table/tree-expanded.xpm b/widgets/table/tree-expanded.xpm deleted file mode 100644 index fc748953eb..0000000000 --- a/widgets/table/tree-expanded.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * tree_expanded_xpm[] = { -"16 16 3 1", -" c None", -". c #000000", -"+ c #FFFFFF", -" ", -" ", -" ", -" ", -" ......... ", -" .+++++++. ", -" .+++++++. ", -" .+++++++. ", -" .+.....+. ", -" .+++++++. ", -" .+++++++. ", -" .+++++++. ", -" ......... ", -" ", -" ", -" "}; diff --git a/widgets/table/tree-unexpanded.xpm b/widgets/table/tree-unexpanded.xpm deleted file mode 100644 index 0dfb12a0a5..0000000000 --- a/widgets/table/tree-unexpanded.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * tree_unexpanded_xpm[] = { -"16 16 3 1", -" c None", -". c #000000", -"+ c #FFFFFF", -" ", -" ", -" ", -" ", -" ......... ", -" .+++++++. ", -" .+++.+++. ", -" .+++.+++. ", -" .+.....+. ", -" .+++.+++. ", -" .+++.+++. ", -" .+++++++. ", -" ......... ", -" ", -" ", -" "}; |