Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests
Modified Files:
ewl_combo.c ewl_tree2.c
Log Message:
- move the header_fetch call from the model to the view where it belongs
- actually set combo3 to be editable (still segvs when selecting, gdb seems
to say there is infinite recusion in evas_object_clip_dirty so I'm not
sure whats going on there)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/tests/ewl_combo.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_combo.c 13 Mar 2006 21:38:08 -0000 1.7
+++ ewl_combo.c 13 Mar 2006 22:26:07 -0000 1.8
@@ -53,12 +53,12 @@
model = ewl_model_new();
ewl_model_fetch_set(model, combo_test_data_fetch);
ewl_model_count_set(model, combo_test_data_count_get);
- ewl_model_header_fetch_set(model, combo_test_data_header_fetch);
/* create the view for ewl_label widgets */
view = ewl_view_new();
ewl_view_constructor_set(view, ewl_label_new);
ewl_view_assign_set(view, EWL_VIEW_ASSIGN(ewl_label_text_set));
+ ewl_view_header_fetch_set(view, combo_test_data_header_fetch);
combo = ewl_combo_new();
ewl_widget_name_set(combo, "combo_label");
@@ -74,6 +74,7 @@
view = ewl_view_new();
ewl_view_constructor_set(view, ewl_image_new);
ewl_view_assign_set(view, EWL_VIEW_ASSIGN(ewl_image_file_path_set));
+ ewl_view_header_fetch_set(view, combo_test_data_header_fetch);
combo = ewl_combo_new();
ewl_widget_name_set(combo, "combo_image");
@@ -89,13 +90,13 @@
model = ewl_model_new();
ewl_model_count_set(model, combo_test_data_count_get);
ewl_model_fetch_set(model, combo_test_data_fetch);
- ewl_model_header_fetch_set(model,
- combo_test_data_editable_header_fetch);
view = ewl_view_new();
ewl_view_constructor_set(view, combo_test_editable_new);
ewl_view_assign_set(view,
EWL_VIEW_ASSIGN(combo_test_editable_val_set));
+ ewl_view_header_fetch_set(view,
+ combo_test_data_editable_header_fetch);
combo = ewl_combo_new();
ewl_widget_name_set(combo, "combo_custom");
@@ -105,6 +106,7 @@
ewl_combo_model_set(EWL_COMBO(combo), model);
ewl_combo_view_set(EWL_COMBO(combo), view);
ewl_combo_data_set(EWL_COMBO(combo), data);
+ ewl_combo_editable_set(EWL_COMBO(combo), TRUE);
ewl_widget_show(combo);
o = ewl_button_new();
@@ -213,7 +215,6 @@
char *val;
d = data;
-
w = ewl_hbox_new();
if (col > -1)
{
@@ -227,8 +228,6 @@
else
val = "Please select an option.";
-printf("%d %s\n", col, val);
-
o = ewl_entry_new();
ewl_text_text_set(EWL_TEXT(o), val);
ewl_container_child_append(EWL_CONTAINER(w), o);
@@ -252,8 +251,6 @@
{
Ewl_Widget *o;
-printf("%s\n", (char *)data);
-
o = ewl_image_new();
ewl_image_file_path_set(EWL_IMAGE(o), (char *)data);
ewl_container_child_append(EWL_CONTAINER(w), o);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/tests/ewl_tree2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_tree2.c 10 Mar 2006 04:05:42 -0000 1.2
+++ ewl_tree2.c 13 Mar 2006 22:26:07 -0000 1.3
@@ -56,7 +56,6 @@
ewl_model_fetch_set(model, tree2_test_data_fetch);
ewl_model_sort_set(model, tree2_test_data_sort);
ewl_model_count_set(model, tree2_test_data_count_get);
- ewl_model_header_fetch_set(model, tree2_test_data_header_fetch);
tree = ewl_tree2_new();
ewl_container_child_append(EWL_CONTAINER(box), tree);
@@ -68,18 +67,21 @@
view = ewl_view_new();
ewl_view_constructor_set(view, ewl_label_new);
ewl_view_assign_set(view, EWL_VIEW_ASSIGN(ewl_label_text_set));
+ ewl_view_header_fetch_set(view, tree2_test_data_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), model, view);
/* create a view for the second column that just has an ewl image */
view = ewl_view_new();
ewl_view_constructor_set(view, ewl_image_new);
ewl_view_assign_set(view, EWL_VIEW_ASSIGN(ewl_image_file_path_set));
+ ewl_view_header_fetch_set(view, tree2_test_data_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), model, view);
/* create a view for the third column that has a custom widget */
view = ewl_view_new();
ewl_view_constructor_set(view, tree2_test_custom_new);
ewl_view_assign_set(view, tree2_test_custom_assign_set);
+ ewl_view_header_fetch_set(view, tree2_test_data_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), model, view);
return 1;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
