From: <enl...@li...> - 2005-10-11 16:24:50
|
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_dialog.c e_includes.h e_test.c e_widget_check.c e_widget_framelist.c e_widget_radio.c Added Files: e_widget_button.c e_widget_button.h e_widget_list.c e_widget_list.h Log Message: working on more widgety stuff =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- Makefile.am 10 Oct 2005 15:27:51 -0000 1.56 +++ Makefile.am 11 Oct 2005 16:25:00 -0000 1.57 @@ -86,7 +86,9 @@ e_widget.h \ e_widget_check.h \ e_widget_radio.h \ -e_widget_framelist.h +e_widget_framelist.h \ +e_widget_list.h \ +e_widget_button.h enlightenment_src = \ e_user.c \ @@ -155,6 +157,8 @@ e_widget_check.c \ e_widget_radio.c \ e_widget_framelist.c \ +e_widget_list.c \ +e_widget_button.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_dialog.c 10 Oct 2005 12:16:18 -0000 1.24 +++ e_dialog.c 11 Oct 2005 16:25:00 -0000 1.25 @@ -16,7 +16,6 @@ /* local subsystem functions */ static void _e_dialog_free(E_Dialog *dia); static void _e_dialog_cb_button_clicked(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _e_dialog_button_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event); static void _e_dialog_button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event); static void _e_dialog_cb_delete(E_Win *win); static void _e_dialog_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event); @@ -108,7 +107,6 @@ _e_dialog_cb_button_clicked, db); edje_object_part_text_set(db->obj, "button_text", db->label); - evas_object_event_callback_add(db->obj, EVAS_CALLBACK_MOUSE_IN, _e_dialog_button_cb_mouse_in, dia); evas_object_event_callback_add(db->obj, EVAS_CALLBACK_MOUSE_DOWN, _e_dialog_button_cb_mouse_down, db); if (icon) @@ -120,7 +118,6 @@ edje_object_message_signal_process(db->obj); evas_object_show(db->obj_icon); } - edje_object_calc_force(db->obj); edje_object_size_min_calc(db->obj, &mw, &mh); e_box_pack_end(dia->box_object, db->obj); e_box_pack_options_set(db->obj, @@ -293,21 +290,15 @@ db = data; if (db->func) - { - edje_object_signal_emit(db->obj, "focus", ""); - db->func(db->data, db->dialog); - } + { + edje_object_signal_emit(db->obj, "focus", ""); + db->func(db->data, db->dialog); + } else e_object_del(E_OBJECT(db->dialog)); } static void -_e_dialog_button_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event) -{ - edje_object_signal_emit(obj, "enter", ""); -} - -static void _e_dialog_button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event) { E_Dialog *dia; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- e_includes.h 10 Oct 2005 15:27:51 -0000 1.41 +++ e_includes.h 11 Oct 2005 16:25:00 -0000 1.42 @@ -68,3 +68,5 @@ #include "e_widget_check.h" #include "e_widget_radio.h" #include "e_widget_framelist.h" +#include "e_widget_list.h" +#include "e_widget_button.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e_test.c 10 Oct 2005 15:27:51 -0000 1.19 +++ e_test.c 11 Oct 2005 16:25:00 -0000 1.20 @@ -319,12 +319,17 @@ dia = e_dialog_new(con); e_dialog_title_set(dia, "A Test Dialog"); { - Evas_Object *o; + Evas_Object *o, *ol, *hb; Evas_Coord mw, mh; E_Radio_Group *rg; Evas *e; e = e_win_evas_get(dia->win); + + ol = e_widget_list_add(e, 0); + + hb = e_widget_list_add(e, 1); + o = e_widget_framelist_add(e, "My Checklist", 0); e_widget_framelist_object_append(o, e_widget_check_add(e, "Checkbox 1", &my_val)); @@ -340,12 +345,27 @@ e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 2", 2, rg)); e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 3", 3, rg)); e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 4", 4, rg)); + + e_widget_list_object_append(hb, o, 1, 1, 0.5); + + o = e_widget_framelist_add(e, "My Checklist on the right", 0); + + rg = e_widget_radio_group_new(&my_rval); + e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 0", 0, rg)); + e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 1", 1, rg)); + e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 2", 2, rg)); + e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 3", 3, rg)); + e_widget_framelist_object_append(o, e_widget_radio_add(e, "Rad 4", 4, rg)); + + e_widget_list_object_append(hb, o, 0, 0, 0.0); + + e_widget_list_object_append(ol, hb, 1, 1, 0.5); + + o = e_widget_button_add(e, "Button", "enlightenment/exit", NULL, NULL, NULL); + e_widget_list_object_append(ol, o, 0, 0, 1.0); - e_widget_min_size_get(o, &mw, &mh); - e_dialog_content_set(dia, o, mw, mh); - evas_object_show(o); -// e_theme_edje_object_set(o, "base/theme/dialog", -// "widgets/frame"); + e_widget_min_size_get(ol, &mw, &mh); + e_dialog_content_set(dia, ol, mw, mh); } e_dialog_button_add(dia, "OK", NULL, NULL, NULL); e_dialog_button_add(dia, "Apply", "enlightenment/reset", NULL, NULL); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_check.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_widget_check.c 10 Oct 2005 15:27:51 -0000 1.2 +++ e_widget_check.c 11 Oct 2005 16:25:00 -0000 1.3 @@ -33,6 +33,7 @@ "widgets/check"); edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "label", label); + evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); e_widget_min_size_set(obj, mw, mh); if (wd->valptr) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_framelist.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_widget_framelist.c 10 Oct 2005 15:27:51 -0000 1.1 +++ e_widget_framelist.c 11 Oct 2005 16:25:00 -0000 1.2 @@ -10,7 +10,7 @@ }; static void _e_wid_del_hook(Evas_Object *obj); -static void _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source); + /* local subsystem functions */ /* externally accessible functions */ @@ -32,6 +32,7 @@ e_theme_edje_object_set(o, "base/theme/widgets", "widgets/frame"); edje_object_part_text_set(o, "label", label); + evas_object_show(o); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_radio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_widget_radio.c 10 Oct 2005 15:27:51 -0000 1.1 +++ e_widget_radio.c 11 Oct 2005 16:25:00 -0000 1.2 @@ -53,6 +53,7 @@ "widgets/radio"); edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "label", label); + evas_object_show(o); edje_object_size_min_calc(o, &mw, &mh); e_widget_min_size_set(obj, mw, mh); if ((wd->group) && (wd->group->valptr)) |