Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests
Modified Files:
ewl_combo.c ewl_list.c ewl_text_editor.c ewl_tree2.c
Log Message:
- create an ewl_mvc widget. this inherits from ewl_box and provides all of
the common mvc calls.
- make ewl_combo, ewl_list and ewl_tree2 inherit from ewl_mvc and remove all
the duplicated calls.
- This breaks the API. All of the ewl_*_model_set, ewl_*_view_set,
ewl_*_data_set and ewl_*_dirty_set are now ewl_mvc_*_set.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_combo.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_combo.c 13 Jul 2006 19:43:24 -0000 1.15
+++ ewl_combo.c 24 Sep 2006 20:26:50 -0000 1.16
@@ -27,9 +27,9 @@
* combo = ewl_combo_new();
* ewl_callback_append(combo, EWL_CALLBACK_VALUE_CHANGED,
* combo_value_changed, NULL);
- * 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_mvc_model_set(EWL_MVC(combo), model);
+ * ewl_mvc_view_set(EWL_MVC(combo), view);
+ * ewl_mvc_data_set(EWL_MVC(combo), data);
* ewl_widget_show(combo);
* @endcode
*
@@ -130,9 +130,9 @@
ewl_container_child_append(EWL_CONTAINER(hbox), combo);
ewl_callback_append(combo, EWL_CALLBACK_VALUE_CHANGED,
combo_value_changed, NULL);
- 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_mvc_model_set(EWL_MVC(combo), model);
+ ewl_mvc_view_set(EWL_MVC(combo), view);
+ ewl_mvc_data_set(EWL_MVC(combo), data);
ewl_widget_show(combo);
/* create the view for ewl_image widgets */
@@ -146,9 +146,9 @@
ewl_container_child_append(EWL_CONTAINER(hbox), combo);
ewl_callback_append(combo, EWL_CALLBACK_VALUE_CHANGED,
combo_value_changed, NULL);
- 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_mvc_model_set(EWL_MVC(combo), model);
+ ewl_mvc_view_set(EWL_MVC(combo), view);
+ ewl_mvc_data_set(EWL_MVC(combo), data);
ewl_widget_show(combo);
/* create the editable model/view */
@@ -168,9 +168,9 @@
ewl_container_child_append(EWL_CONTAINER(hbox), combo);
ewl_callback_append(combo, EWL_CALLBACK_VALUE_CHANGED,
combo_value_changed, NULL);
- 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_mvc_model_set(EWL_MVC(combo), model);
+ ewl_mvc_view_set(EWL_MVC(combo), view);
+ ewl_mvc_data_set(EWL_MVC(combo), data);
ewl_combo_editable_set(EWL_COMBO(combo), TRUE);
ewl_widget_show(combo);
@@ -240,7 +240,7 @@
Combo_Test_Data *d;
int idx;
- d = ewl_combo_data_get(EWL_COMBO(w));
+ d = ewl_mvc_data_get(EWL_MVC(w));
idx = ewl_combo_selected_get(EWL_COMBO(w));
if (idx > -1)
printf("value changed to %d (%s)\n", idx, d->data[idx]);
@@ -257,7 +257,7 @@
int s;
c = ewl_widget_name_find("combo_label");
- d = ewl_combo_data_get(EWL_COMBO(c));
+ d = ewl_mvc_data_get(EWL_MVC(c));
s = d->count;
d->count += 2;
@@ -266,10 +266,10 @@
d->data[s] = strdup(PACKAGE_DATA_DIR "/images/Package.png");
d->data[s + 1] = strdup(PACKAGE_DATA_DIR "/images/Open.png");
- ewl_combo_dirty_set(EWL_COMBO(c), 1);
+ ewl_mvc_dirty_set(EWL_MVC(c), 1);
c = ewl_widget_name_find("combo_image");
- ewl_combo_dirty_set(EWL_COMBO(c), 1);
+ ewl_mvc_dirty_set(EWL_MVC(c), 1);
}
static Ewl_Widget *
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_list.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_list.c 10 Sep 2006 15:54:44 -0000 1.4
+++ ewl_list.c 24 Sep 2006 20:26:50 -0000 1.5
@@ -68,9 +68,9 @@
list = ewl_list_new();
ewl_container_child_append(EWL_CONTAINER(o), list);
ewl_box_orientation_set(EWL_BOX(list), EWL_ORIENTATION_HORIZONTAL);
- ewl_list_model_set(EWL_LIST(list), model);
- ewl_list_view_set(EWL_LIST(list), view);
- ewl_list_data_set(EWL_LIST(list), str_data);
+ ewl_mvc_model_set(EWL_MVC(list), model);
+ ewl_mvc_view_set(EWL_MVC(list), view);
+ ewl_mvc_data_set(EWL_MVC(list), str_data);
ewl_callback_append(list, EWL_CALLBACK_VALUE_CHANGED,
list_cb_value_changed, NULL);
ewl_widget_show(list);
@@ -95,9 +95,9 @@
list = ewl_list_new();
ewl_container_child_append(EWL_CONTAINER(o), list);
- ewl_list_model_set(EWL_LIST(list), model);
- ewl_list_view_set(EWL_LIST(list), view);
- ewl_list_data_set(EWL_LIST(list), data);
+ ewl_mvc_model_set(EWL_MVC(list), model);
+ ewl_mvc_view_set(EWL_MVC(list), view);
+ ewl_mvc_data_set(EWL_MVC(list), data);
ewl_widget_show(list);
@@ -196,7 +196,7 @@
Ecore_List *el;
list = EWL_LIST(w);
- el = ewl_list_data_get(list);
+ el = ewl_mvc_data_get(EWL_MVC(list));
ecore_list_goto_index(el, ewl_list_selected_index_get(list));
printf("Selected (%s)\n", (char *)ecore_list_current(el));
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_text_editor.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_text_editor.c 11 Sep 2006 04:59:33 -0000 1.16
+++ ewl_text_editor.c 24 Sep 2006 20:26:50 -0000 1.17
@@ -130,9 +130,9 @@
model = ewl_model_ecore_list_get();
view = ewl_label_view_get();
o = ewl_combo_new();
- ewl_combo_model_set(EWL_COMBO(o), model);
- ewl_combo_view_set(EWL_COMBO(o), view);
- ewl_combo_data_set(EWL_COMBO(o), styles);
+ ewl_mvc_model_set(EWL_MVC(o), model);
+ ewl_mvc_view_set(EWL_MVC(o), view);
+ ewl_mvc_data_set(EWL_MVC(o), styles);
ewl_combo_selected_set(EWL_COMBO(o), 0);
ewl_container_child_append(EWL_CONTAINER(hbox), o);
ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED,
@@ -255,7 +255,7 @@
char *str;
idx = ewl_combo_selected_get(EWL_COMBO(w));
- str = ecore_list_goto_index(ewl_combo_data_get(EWL_COMBO(w)),
+ str = ecore_list_goto_index(ewl_mvc_data_get(EWL_MVC(w)),
ewl_combo_selected_get(EWL_COMBO(w)));
entry = ewl_widget_name_find("entry");
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_tree2.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_tree2.c 10 Sep 2006 15:54:44 -0000 1.13
+++ ewl_tree2.c 24 Sep 2006 20:26:50 -0000 1.14
@@ -330,7 +330,7 @@
else
view = ewl_tree2_view_scrolled_get();
- ewl_tree2_view_set(tree, view);
+ ewl_mvc_view_set(EWL_MVC(tree), view);
}
static void
@@ -342,10 +342,10 @@
tree = ewl_widget_name_find("tree");
spinner = ewl_widget_name_find("rows_spinner");
- d = ewl_tree2_data_get(EWL_TREE2(tree));
+ d = ewl_mvc_data_get(EWL_MVC(tree));
d->count = ewl_range_value_get(EWL_RANGE(spinner));
- ewl_tree2_dirty_set(EWL_TREE2(tree), TRUE);
+ ewl_mvc_dirty_set(EWL_MVC(tree), TRUE);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
