Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_button_test.c etk_canvas_test.c etk_entry_test.c
etk_filechooser_test.c etk_image_test.c etk_menu_test.c
etk_notebook_test.c etk_paned_test.c etk_slider_test.c
etk_table_test.c etk_test.c etk_tree_test.c
Log Message:
* Add 22x22 and 48x48 stock_icons
* Update the collection of stock_icons. It now uses the Tango project
icon set v0.6.5
* FALSE --> ETK_FALSE and TRUE --> ETK_TRUE
* Some work on the notebook
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_button_test.c 2 Dec 2005 21:57:55 -0000 1.5
+++ etk_button_test.c 15 Jan 2006 11:07:16 -0000 1.6
@@ -23,37 +23,37 @@
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- vbox = etk_vbox_new(FALSE, 3);
+ vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(win), vbox);
button_normal = etk_button_new_with_label(_("Normal button"));
- etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
button_normal = etk_button_new_with_label(_("Button with an image"));
etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image));
- etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
button_normal = etk_button_new();
- etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
button_check = etk_check_button_new_with_label(_("Check button"));
- etk_box_pack_start(ETK_BOX(vbox), button_check, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
button_check = etk_check_button_new();
- etk_box_pack_start(ETK_BOX(vbox), button_check, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
button_radio = etk_radio_button_new_with_label(_("Radio button"), NULL);
- etk_box_pack_start(ETK_BOX(vbox), button_radio, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
button_radio =
etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio));
- etk_box_pack_start(ETK_BOX(vbox), button_radio, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
button_toggle = etk_toggle_button_new_with_label(_("Toggle button"));
- etk_box_pack_start(ETK_BOX(vbox), button_toggle, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
button_toggle = etk_toggle_button_new();
- etk_box_pack_start(ETK_BOX(vbox), button_toggle, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_canvas_test.c 20 Nov 2005 10:33:28 -0000 1.6
+++ etk_canvas_test.c 15 Jan 2006 11:07:16 -0000 1.7
@@ -22,16 +22,16 @@
etk_window_title_set(ETK_WINDOW(win), _("Etk Canvas Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- vbox = etk_vbox_new(FALSE, 5);
+ vbox = etk_vbox_new(ETK_FALSE, 5);
etk_container_add(ETK_CONTAINER(win), vbox);
canvas = etk_canvas_new();
etk_widget_size_request_set(canvas, 300, 200);
- etk_box_pack_start(ETK_BOX(vbox), canvas, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), canvas, ETK_TRUE, ETK_TRUE, 0);
button = etk_button_new_with_label(_("Add object"));
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_canvas_object_add), canvas);
- etk_box_pack_start(ETK_BOX(vbox), button, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button, ETK_FALSE, ETK_FALSE, 0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_entry_test.c 20 Nov 2005 10:33:28 -0000 1.5
+++ etk_entry_test.c 15 Jan 2006 11:07:16 -0000 1.6
@@ -22,7 +22,7 @@
etk_window_title_set(ETK_WINDOW(win), _("Etk Entry Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- table = etk_table_new(2, 2, FALSE);
+ table = etk_table_new(2, 2, ETK_FALSE);
etk_container_add(ETK_CONTAINER(win), table);
entry = etk_entry_new();
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_filechooser_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_filechooser_test.c 2 Dec 2005 21:57:55 -0000 1.1
+++ etk_filechooser_test.c 15 Jan 2006 11:07:16 -0000 1.2
@@ -17,7 +17,7 @@
etk_signal_connect("delete_event", ETK_OBJECT(dialog),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
filechooser = etk_filechooser_widget_new();
- etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), filechooser, TRUE, TRUE,
0, FALSE);
+ etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), filechooser, ETK_TRUE,
ETK_TRUE, 0, ETK_FALSE);
etk_dialog_button_add(ETK_DIALOG(dialog), "Open", 1);
etk_dialog_button_add(ETK_DIALOG(dialog), "Close", 2);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_image_test.c 20 Nov 2005 10:33:28 -0000 1.3
+++ etk_image_test.c 15 Jan 2006 11:07:16 -0000 1.4
@@ -20,13 +20,13 @@
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
- etk_image_keep_aspect_set(ETK_IMAGE(images[0]), TRUE);
+ etk_image_keep_aspect_set(ETK_IMAGE(images[0]), ETK_TRUE);
images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
- etk_image_keep_aspect_set(ETK_IMAGE(images[1]), FALSE);
+ etk_image_keep_aspect_set(ETK_IMAGE(images[1]), ETK_FALSE);
labels[0] = etk_label_new(_("Keep aspect"));
labels[1] = etk_label_new(_("Don't keep aspect"));
- table = etk_table_new(2, 2, FALSE);
+ table = etk_table_new(2, 2, ETK_FALSE);
etk_table_attach_defaults(ETK_TABLE(table), images[0], 0, 0, 0, 0);
etk_table_attach_defaults(ETK_TABLE(table), images[1], 1, 1, 0, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_menu_test.c 19 Dec 2005 13:30:32 -0000 1.7
+++ etk_menu_test.c 15 Jan 2006 11:07:16 -0000 1.8
@@ -38,19 +38,19 @@
/****************
* The window
****************/
- vbox = etk_vbox_new(FALSE, 0);
+ vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
menu_bar = etk_menu_bar_new();
- etk_box_pack_start(ETK_BOX(vbox), menu_bar, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), menu_bar, ETK_FALSE, ETK_FALSE, 0);
label = etk_label_new(_("Click me :)"));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_widget_pass_events_set(label, TRUE);
- etk_box_pack_start(ETK_BOX(vbox), label, TRUE, TRUE, 0);
+ etk_widget_pass_events_set(label, ETK_TRUE);
+ etk_box_pack_start(ETK_BOX(vbox), label, ETK_TRUE, ETK_TRUE, 0);
statusbar = etk_statusbar_new();
- etk_box_pack_end(ETK_BOX(vbox), statusbar, FALSE, FALSE, 0);
+ etk_box_pack_end(ETK_BOX(vbox), statusbar, ETK_FALSE, ETK_FALSE, 0);
/****************
* Menu Bar
@@ -133,7 +133,7 @@
{
Etk_Widget *image;
- image = etk_image_new_from_stock(stock_id);
+ image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image));
}
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_notebook_test.c 24 Dec 2005 18:13:06 -0000 1.3
+++ etk_notebook_test.c 15 Jan 2006 11:07:16 -0000 1.4
@@ -76,14 +76,14 @@
widget[19] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
- vbox = etk_vbox_new(FALSE, 0);
- hbox = etk_hbox_new(FALSE, 0);
- table = etk_table_new(2, 10, FALSE);
-
- etk_box_pack_start(ETK_BOX(vbox), table, FALSE, FALSE, 0);
- etk_box_pack_end(ETK_BOX(vbox), hbox, FALSE, FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), widget[18], FALSE, FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), widget[17], FALSE, FALSE, 0);
+ vbox = etk_vbox_new(ETK_FALSE, 0);
+ hbox = etk_hbox_new(ETK_FALSE, 0);
+ table = etk_table_new(2, 10, ETK_FALSE);
+
+ etk_box_pack_start(ETK_BOX(vbox), table, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_pack_end(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_pack_end(ETK_BOX(hbox), widget[18], ETK_FALSE, ETK_FALSE, 0);
+ etk_box_pack_end(ETK_BOX(hbox), widget[17], ETK_FALSE, ETK_FALSE, 0);
etk_table_attach(ETK_TABLE(table), widget[19], 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
etk_table_attach(ETK_TABLE(table), widget[20], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
@@ -120,37 +120,37 @@
alignment = etk_alignment_new(0.5, 0.5, 0.5, 0.0);
- vbox = etk_vbox_new(FALSE, 3);
+ vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(alignment), vbox);
button_normal = etk_button_new_with_label(_("Normal button"));
- etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
button_normal = etk_button_new_with_label(_("Button with an image"));
etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image));
- etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
button_normal = etk_button_new();
- etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
button_check = etk_check_button_new_with_label(_("Check button"));
- etk_box_pack_start(ETK_BOX(vbox), button_check, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
button_check = etk_check_button_new();
- etk_box_pack_start(ETK_BOX(vbox), button_check, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
button_radio = etk_radio_button_new_with_label(_("Radio button"), NULL);
- etk_box_pack_start(ETK_BOX(vbox), button_radio, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
button_radio =
etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio));
- etk_box_pack_start(ETK_BOX(vbox), button_radio, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
button_toggle = etk_toggle_button_new_with_label(_("Toggle button"));
- etk_box_pack_start(ETK_BOX(vbox), button_toggle, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
button_toggle = etk_toggle_button_new();
- etk_box_pack_start(ETK_BOX(vbox), button_toggle, FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
return alignment;
}
@@ -161,15 +161,15 @@
Etk_Widget *hbox;
Etk_Widget *slider;
- hbox = etk_hbox_new(TRUE, 0);
+ hbox = etk_hbox_new(ETK_TRUE, 0);
slider = etk_hslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_widget_size_request_set(slider, 130, 130);
- etk_box_pack_start(ETK_BOX(hbox), slider, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), slider, ETK_TRUE, ETK_TRUE, 0);
slider = etk_vslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_widget_size_request_set(slider, 130, 130);
- etk_box_pack_end(ETK_BOX(hbox), slider, TRUE, TRUE, 0);
+ etk_box_pack_end(ETK_BOX(hbox), slider, ETK_TRUE, ETK_TRUE, 0);
return hbox;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_paned_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_paned_test.c 19 Dec 2005 13:30:32 -0000 1.3
+++ etk_paned_test.c 15 Jan 2006 11:07:16 -0000 1.4
@@ -22,54 +22,54 @@
etk_widget_size_request_set(win, 300, 300);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- vbox = etk_vbox_new(FALSE, 0);
+ vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
/* Paned Area */
vpaned = etk_vpaned_new();
- etk_box_pack_start(ETK_BOX(vbox), vpaned, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), vpaned, ETK_TRUE, ETK_TRUE, 0);
hpaned = etk_hpaned_new();
- etk_paned_add1(ETK_PANED(vpaned), hpaned, FALSE);
+ etk_paned_add1(ETK_PANED(vpaned), hpaned, ETK_FALSE);
label = etk_label_new(_("HPaned Child 1"));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_paned_add1(ETK_PANED(hpaned), label, TRUE);
+ etk_paned_add1(ETK_PANED(hpaned), label, ETK_TRUE);
label = etk_label_new(_("HPaned Child 2"));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_paned_add2(ETK_PANED(hpaned), label, FALSE);
+ etk_paned_add2(ETK_PANED(hpaned), label, ETK_FALSE);
label = etk_label_new(_("VPaned Child 2"));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_paned_add2(ETK_PANED(vpaned), label, TRUE);
+ etk_paned_add2(ETK_PANED(vpaned), label, ETK_TRUE);
hseparator = etk_hseparator_new();
- etk_box_pack_start(ETK_BOX(vbox), hseparator, FALSE, FALSE, 6);
+ etk_box_pack_start(ETK_BOX(vbox), hseparator, ETK_FALSE, ETK_FALSE, 6);
/* Properties Area */
- hbox = etk_hbox_new(TRUE, 0);
- etk_box_pack_start(ETK_BOX(vbox), hbox, FALSE, TRUE, 0);
+ hbox = etk_hbox_new(ETK_TRUE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_TRUE, 0);
frame = etk_frame_new(_("HPaned Properties"));
- etk_box_pack_start(ETK_BOX(hbox), frame, TRUE, TRUE, 0);
- vbox = etk_vbox_new(TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), frame, ETK_TRUE, ETK_TRUE, 0);
+ vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
check_button = etk_check_button_new_with_label(_("Child 1 Expand"));
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), TRUE);
- etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
+ etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
check_button = etk_check_button_new_with_label(_("Child 2 Expand"));
- etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
frame = etk_frame_new(_("VPaned Properties"));
- etk_box_pack_start(ETK_BOX(hbox), frame, TRUE, TRUE, 0);
- vbox = etk_vbox_new(TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), frame, ETK_TRUE, ETK_TRUE, 0);
+ vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
check_button = etk_check_button_new_with_label(_("Child 1 Expand"));
- etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
check_button = etk_check_button_new_with_label(_("Child 2 Expand"));
- etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), TRUE);
- etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
+ etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_slider_test.c 23 Dec 2005 14:48:14 -0000 1.2
+++ etk_slider_test.c 15 Jan 2006 11:07:16 -0000 1.3
@@ -21,7 +21,7 @@
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- table = etk_table_new(2, 2, FALSE);
+ table = etk_table_new(2, 2, ETK_FALSE);
etk_container_add(ETK_CONTAINER(win), table);
slider = etk_hslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_table_test.c 2 Dec 2005 21:57:55 -0000 1.6
+++ etk_table_test.c 15 Jan 2006 11:07:16 -0000 1.7
@@ -54,16 +54,16 @@
widget[19] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
- vbox = etk_vbox_new(FALSE, 0);
- hbox = etk_hbox_new(FALSE, 0);
- table = etk_table_new(2, 10, FALSE);
+ vbox = etk_vbox_new(ETK_FALSE, 0);
+ hbox = etk_hbox_new(ETK_FALSE, 0);
+ table = etk_table_new(2, 10, ETK_FALSE);
etk_container_add(ETK_CONTAINER(win), vbox);
- etk_box_pack_start(ETK_BOX(vbox), table, FALSE, FALSE, 0);
- etk_box_pack_end(ETK_BOX(vbox), hbox, FALSE, FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), widget[18], FALSE, FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), widget[17], FALSE, FALSE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), table, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_pack_end(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_pack_end(ETK_BOX(hbox), widget[18], ETK_FALSE, ETK_FALSE, 0);
+ etk_box_pack_end(ETK_BOX(hbox), widget[17], ETK_FALSE, ETK_FALSE, 0);
etk_table_attach(ETK_TABLE(table), widget[19], 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
etk_table_attach(ETK_TABLE(table), widget[20], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_test.c 23 Dec 2005 23:01:06 -0000 1.10
+++ etk_test.c 15 Jan 2006 11:07:16 -0000 1.11
@@ -88,7 +88,7 @@
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("destroyed", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_main_quit_cb), NULL);
- table = etk_table_new((num_tests + 4) / 5, 5, TRUE);
+ table = etk_table_new((num_tests + 4) / 5, 5, ETK_TRUE);
etk_container_add(ETK_CONTAINER(win), table);
for (i = 0; i < num_tests; i++)
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_tree_test.c 21 Dec 2005 13:52:41 -0000 1.19
+++ etk_tree_test.c 15 Jan 2006 11:07:16 -0000 1.20
@@ -3,9 +3,6 @@
#include <stdlib.h>
#include "config.h"
-/* TODO: Etk_Theme */
-#define ETK_DEFAULT_ICON_SET_FILE PACKAGE_DATA_DIR "/stock_icons/default.edj"
-
static void _etk_test_tree_add_items(Etk_Tree *tree, int n);
static void _etk_test_tree_row_selected(Etk_Object *object, Etk_Tree_Row *row,
void *data);
static void _etk_test_tree_row_unselected(Etk_Object *object, Etk_Tree_Row
*row, void *data);
@@ -17,7 +14,7 @@
static void _etk_test_tree_sort_cb(Etk_Object *object, void *data);
static int _etk_test_tree_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
-static Etk_Bool ascendant = TRUE;
+static Etk_Bool ascendant = ETK_TRUE;
/* Creates the window for the tree test */
void etk_test_tree_window_create(void *data)
@@ -43,7 +40,7 @@
etk_window_title_set(ETK_WINDOW(win), _("Etk Tree Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- table = etk_table_new(2, 3, FALSE);
+ table = etk_table_new(2, 3, ETK_FALSE);
etk_container_add(ETK_CONTAINER(win), table);
/* The tree: */
@@ -55,9 +52,9 @@
etk_table_attach_defaults(ETK_TABLE(table), tree, 0, 0, 1, 1);
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_TREE);
- etk_tree_multiple_select_set(ETK_TREE(tree), TRUE);
+ etk_tree_multiple_select_set(ETK_TREE(tree), ETK_TRUE);
col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_EDJE), 60);
- etk_tree_col_expand_set(col1, TRUE);
+ etk_tree_col_expand_set(col1, ETK_TRUE);
col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_double_new(ETK_TREE(tree)), 60);
col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"),
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 60);
etk_tree_build(ETK_TREE(tree));
@@ -65,11 +62,11 @@
etk_tree_freeze(ETK_TREE(tree));
for (i = 0; i < 1000; i++)
{
- row = etk_tree_append(ETK_TREE(tree), col1, ETK_DEFAULT_ICON_SET_FILE,
"mimetypes/x-directory-normal-home", _("Row1"),
+ row = etk_tree_append(ETK_TREE(tree), col1, etk_theme_icon_theme_get(),
"places/user-home_16", _("Row1"),
col2, 10.0, col3, PACKAGE_DATA_DIR "/images/1star.png", NULL);
- row = etk_tree_append_to_row(row, col1, ETK_DEFAULT_ICON_SET_FILE,
"mimetypes/x-directory-normal", _("Row2"),
+ row = etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"places/folder_16", _("Row2"),
col2, 20.0, col3, PACKAGE_DATA_DIR "/images/2stars.png", NULL);
- etk_tree_append_to_row(row, col1, ETK_DEFAULT_ICON_SET_FILE,
"mimetypes/text-x-generic", _("Row3"),
+ etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"mimetypes/text-x-generic_16", _("Row3"),
col2, 30.0, col3, PACKAGE_DATA_DIR "/images/3stars.png", NULL);
}
etk_tree_thaw(ETK_TREE(tree));
@@ -83,7 +80,7 @@
etk_table_attach_defaults(ETK_TABLE(table), tree, 1, 1, 1, 1);
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_LIST);
- etk_tree_multiple_select_set(ETK_TREE(tree), TRUE);
+ etk_tree_multiple_select_set(ETK_TREE(tree), ETK_TRUE);
col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_int_new(ETK_TREE(tree)), 90);
col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"),
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
@@ -96,32 +93,32 @@
/* Frame */
frame = etk_frame_new(_("List Actions"));
etk_table_attach(ETK_TABLE(table), frame, 0, 1, 2, 2, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL);
- hbox = etk_hbox_new(TRUE, 10);
+ hbox = etk_hbox_new(ETK_TRUE, 10);
etk_container_add(ETK_CONTAINER(frame), hbox);
button = etk_button_new_with_label(_("Clear"));
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_clear_list_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
button = etk_button_new_with_label(_("Add 5 rows"));
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_5_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
button = etk_button_new_with_label(_("Add 50 rows"));
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_50_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
button = etk_button_new_with_label(_("Add 500 rows"));
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_500_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
button = etk_button_new_with_label(_("Add 5000 rows"));
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_5000_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
button = etk_button_new_with_label(_("Sort"));
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_sort_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, TRUE, TRUE, 0);
+ etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
etk_widget_show_all(win);
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
