Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_embed_test.c etk_entry_test.c etk_image_test.c
etk_notebook_test.c etk_slider_test.c etk_table_test.c
etk_test.c etk_tree_test.c
Log Message:
New API BREAK!! :)
* Change the name of the fill policy flags the table:
e.g. ETK_FILL_POLICY_HEXPAND --> ETK_TABLE_HEXPAND
also, 3 more convenient flags:
ETK_TABLE_EXPAND = ETK_TABLE_HEXPAND | ETK_TABLE_VEXPAND
ETK_TABLE_FILL = ETK_TABLE_HFILL | ETK_TABLE_VFILL
ETK_TABLE_EXPAND_FILL = ETK_TABLE_FILL | ETK_TABLE_EXPAND
* etk_table_attach_defaults() --> etk_table_attach_default()
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_embed_test.c 2 Jul 2006 04:01:19 -0000 1.5
+++ etk_embed_test.c 15 Aug 2006 16:33:26 -0000 1.6
@@ -121,19 +121,19 @@
table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
- etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0, ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_TABLE_HEXPAND);
for (i = 0; i < 6; i++)
{
- etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
}
- etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
embed = etk_embed_new(evas, NULL, NULL);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_entry_test.c 24 Jun 2006 17:54:06 -0000 1.8
+++ etk_entry_test.c 15 Aug 2006 16:33:26 -0000 1.9
@@ -27,18 +27,18 @@
etk_container_add(ETK_CONTAINER(win), table);
entry = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), entry, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
+ etk_table_attach(ETK_TABLE(table), entry, 0, 0, 0, 0, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
button = etk_button_new_with_label("Print text");
- etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_TABLE_NONE);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_print_clicked), NULL);
button = etk_toggle_button_new_with_label("Toggle password");
- etk_table_attach(ETK_TABLE(table), button, 2, 2, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), button, 2, 2, 0, 0, 0, 0,
ETK_TABLE_NONE);
etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_password_toggled), NULL);
label = etk_label_new(" ");
- etk_table_attach(ETK_TABLE(table), label, 0, 1, 1, 1, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
+ etk_table_attach(ETK_TABLE(table), label, 0, 1, 1, 1, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_image_test.c 24 Jun 2006 17:54:06 -0000 1.6
+++ etk_image_test.c 15 Aug 2006 16:33:26 -0000 1.7
@@ -28,10 +28,10 @@
labels[1] = etk_label_new("Don't keep aspect");
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);
- etk_table_attach(ETK_TABLE(table), labels[0], 0, 0, 1, 1, 2, 0,
ETK_FILL_POLICY_HEXPAND);
- etk_table_attach(ETK_TABLE(table), labels[1], 1, 1, 1, 1, 2, 0,
ETK_FILL_POLICY_HEXPAND);
+ etk_table_attach_default(ETK_TABLE(table), images[0], 0, 0, 0, 0);
+ etk_table_attach_default(ETK_TABLE(table), images[1], 1, 1, 0, 0);
+ etk_table_attach(ETK_TABLE(table), labels[0], 0, 0, 1, 1, 2, 0,
ETK_TABLE_HEXPAND);
+ etk_table_attach(ETK_TABLE(table), labels[1], 1, 1, 1, 1, 2, 0,
ETK_TABLE_HEXPAND);
etk_container_add(ETK_CONTAINER(win), table);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_notebook_test.c 15 Aug 2006 15:59:01 -0000 1.10
+++ etk_notebook_test.c 15 Aug 2006 16:33:26 -0000 1.11
@@ -95,19 +95,19 @@
table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
- etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0, ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_TABLE_HEXPAND);
for (i = 0; i < 6; i++)
{
- etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
}
- etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
return table;
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_slider_test.c 15 Aug 2006 15:59:01 -0000 1.5
+++ etk_slider_test.c 15 Aug 2006 16:33:26 -0000 1.6
@@ -26,18 +26,18 @@
slider = etk_hslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_widget_size_request_set(slider, 130, 130);
- etk_table_attach_defaults(ETK_TABLE(table), slider, 0, 0, 0, 0);
+ etk_table_attach_default(ETK_TABLE(table), slider, 0, 0, 0, 0);
label = etk_label_new("128.00");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0, ETK_TABLE_NONE);
etk_signal_connect("value_changed", ETK_OBJECT(slider),
ETK_CALLBACK(_etk_test_slider_value_changed), label);
slider = etk_vslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_widget_size_request_set(slider, 130, 130);
- etk_table_attach_defaults(ETK_TABLE(table), slider, 1, 1, 0, 0);
+ etk_table_attach_default(ETK_TABLE(table), slider, 1, 1, 0, 0);
label = etk_label_new("128.00");
- etk_table_attach(ETK_TABLE(table), label, 1, 1, 1, 1, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), label, 1, 1, 1, 1, 0, 0, ETK_TABLE_NONE);
etk_signal_connect("value_changed", ETK_OBJECT(slider),
ETK_CALLBACK(_etk_test_slider_value_changed), label);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_table_test.c 15 Aug 2006 15:59:01 -0000 1.10
+++ etk_table_test.c 15 Aug 2006 16:33:26 -0000 1.11
@@ -47,19 +47,19 @@
table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
- etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0, ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_TABLE_HEXPAND);
for (i = 0; i < 6; i++)
{
- etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
}
- etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
vbox = etk_vbox_new(ETK_FALSE, 0);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- etk_test.c 15 Aug 2006 15:59:01 -0000 1.27
+++ etk_test.c 15 Aug 2006 16:33:26 -0000 1.28
@@ -179,7 +179,7 @@
button = etk_button_new_with_label(_etk_test_examples[i].name);
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_examples[i].func), NULL);
j = current_ids[_etk_test_examples[i].category];
-
etk_table_attach_defaults(ETK_TABLE(tables[_etk_test_examples[i].category]),
button,
+
etk_table_attach_default(ETK_TABLE(tables[_etk_test_examples[i].category]),
button,
j % ETK_TEST_NUM_COLS, j % ETK_TEST_NUM_COLS, j / ETK_TEST_NUM_COLS,
j / ETK_TEST_NUM_COLS);
current_ids[_etk_test_examples[i].category]++;
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- etk_tree_test.c 15 Aug 2006 15:59:01 -0000 1.32
+++ etk_tree_test.c 15 Aug 2006 16:33:26 -0000 1.33
@@ -50,11 +50,11 @@
/* The tree: */
label = etk_label_new("<h1>Tree:</h1>");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, 0, 0, ETK_TABLE_FILL);
tree = etk_tree_new();
etk_widget_size_request_set(tree, 320, 400);
- etk_table_attach_defaults(ETK_TABLE(table), tree, 0, 0, 1, 1);
+ etk_table_attach_default(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), ETK_TRUE);
@@ -79,7 +79,7 @@
/* The list: */
label = etk_label_new("<h1>List:</h1>");
- etk_table_attach(ETK_TABLE(table), label, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL);
+ etk_table_attach(ETK_TABLE(table), label, 1, 1, 0, 0, 0, 0, ETK_TABLE_FILL);
tree = etk_tree_new();
etk_widget_dnd_source_set(ETK_WIDGET(tree), ETK_TRUE);
@@ -87,7 +87,7 @@
etk_signal_connect("drag_drop", ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_drag_drop_cb), NULL);
etk_signal_connect("drag_begin", ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_drag_begin_cb), NULL);
etk_widget_size_request_set(tree, 320, 400);
- etk_table_attach_defaults(ETK_TABLE(table), tree, 1, 1, 1, 1);
+ etk_table_attach_default(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), ETK_TRUE);
@@ -105,7 +105,7 @@
/* 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);
+ etk_table_attach(ETK_TABLE(table), frame, 0, 1, 2, 2, 0, 0, ETK_TABLE_FILL);
hbox = etk_hbox_new(ETK_TRUE, 10);
etk_container_add(ETK_CONTAINER(frame), hbox);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
