Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_int_shelf_config.c e_widget_radio.c
e_widget_radio.h
Log Message:
iconradio elements are available now
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- e_config.c 20 May 2006 03:23:12 -0000 1.172
+++ e_config.c 21 May 2006 11:00:03 -0000 1.173
@@ -572,7 +572,7 @@
e_config->winlist_pos_min_h = 0;
e_config->winlist_pos_max_w = 320;
e_config->winlist_pos_max_h = 320;
- e_config->maximize_policy = E_MAXIMIZE_FULLSCREEN;
+ e_config->maximize_policy = E_MAXIMIZE_SMART;
e_config->allow_manip = 0;
e_config->kill_if_close_not_possible = 1;
e_config->kill_process = 1;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_int_shelf_config.c 16 May 2006 07:32:37 -0000 1.9
+++ e_int_shelf_config.c 21 May 2006 11:00:04 -0000 1.10
@@ -181,6 +181,38 @@
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
+ of = e_widget_frametable_add(evas, _("Layout"), 1);
+ rg = e_widget_radio_group_new(&(cfdata->orient));
+ ob = e_widget_radio_icon_add(evas, _("Left"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_LEFT, rg);
+ e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Right"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_RIGHT, rg);
+ e_widget_frametable_object_append(of, ob, 4, 2, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Top"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_TOP, rg);
+ e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Bottom"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_BOTTOM, rg);
+ e_widget_frametable_object_append(of, ob, 2, 4, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_TL, rg);
+ e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_TR, rg);
+ e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_BL, rg);
+ e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_BR, rg);
+ e_widget_frametable_object_append(of, ob, 3, 4, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_LT, rg);
+ e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_RT, rg);
+ e_widget_frametable_object_append(of, ob, 4, 1, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_LB, rg);
+ e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32,
E_GADCON_ORIENT_CORNER_RB, rg);
+ e_widget_frametable_object_append(of, ob, 4, 3, 1, 1, 1, 1, 1, 1);
+ e_widget_list_object_append(o2, of, 1, 1, 0.5);
+
+ e_widget_list_object_append(o, o2, 1, 1, 0.5);
+
+ o2 = e_widget_list_add(evas, 0, 0);
+
of = e_widget_framelist_add(evas, _("Size"), 0);
ob = e_widget_check_add(evas, _("Shrink to Content Size"),
&(cfdata->fit_along));
e_widget_framelist_object_append(of, ob);
@@ -188,42 +220,10 @@
// e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Shelf Size"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL,
&(cfdata->size), 200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL,
&(cfdata->size), 100);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Layout"), 0);
- rg = e_widget_radio_group_new(&(cfdata->orient));
- ob = e_widget_radio_add(evas, _("Left"), E_GADCON_ORIENT_LEFT, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Right"), E_GADCON_ORIENT_RIGHT, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Top"), E_GADCON_ORIENT_TOP, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Bottom"), E_GADCON_ORIENT_BOTTOM, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Top Left"), E_GADCON_ORIENT_CORNER_TL, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Top Right"), E_GADCON_ORIENT_CORNER_TR,
rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Bottom Left"), E_GADCON_ORIENT_CORNER_BL,
rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Bottom Right"), E_GADCON_ORIENT_CORNER_BR,
rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Left Top"), E_GADCON_ORIENT_CORNER_LT, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Right Top"), E_GADCON_ORIENT_CORNER_RT,
rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Left Bottom"), E_GADCON_ORIENT_CORNER_LB,
rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Right Bottom"), E_GADCON_ORIENT_CORNER_RB,
rg);
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o2, of, 1, 1, 0.5);
-
- e_widget_list_object_append(o, o2, 1, 1, 0.5);
-
- o2 = e_widget_list_add(evas, 0, 0);
-
of = e_widget_framelist_add(evas, _("Styles"), 0);
oi = e_widget_ilist_add(evas, 128, 20, &(cfdata->style));
@@ -246,7 +246,7 @@
sel = n;
}
e_widget_min_size_get(oi, &wmw, &wmh);
- e_widget_min_size_set(oi, wmw, 250);
+ e_widget_min_size_set(oi, wmw, 150);
e_widget_ilist_go(oi);
e_widget_ilist_selected_set(oi, sel);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_radio.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_widget_radio.c 8 May 2006 11:47:20 -0000 1.12
+++ e_widget_radio.c 21 May 2006 11:00:04 -0000 1.13
@@ -14,6 +14,7 @@
{
E_Radio_Group *group;
Evas_Object *o_radio;
+ Evas_Object *o_icon;
int valnum;
};
@@ -79,6 +80,62 @@
return obj;
}
+
+EAPI Evas_Object *
+e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int
icon_h, int valnum, E_Radio_Group *group)
+{
+ Evas_Object *obj, *o, *o2;
+ E_Widget_Data *wd;
+ Evas_Coord mw, mh;
+
+ obj = e_widget_add(evas);
+
+ e_widget_del_hook_set(obj, _e_wid_del_hook);
+ e_widget_focus_hook_set(obj, _e_wid_focus_hook);
+ e_widget_activate_hook_set(obj, _e_wid_activate_hook);
+ e_widget_disable_hook_set(obj, _e_wid_disable_hook);
+ wd = calloc(1, sizeof(E_Widget_Data));
+ wd->group = group;
+ wd->valnum = valnum;
+ e_widget_data_set(obj, wd);
+
+ o = edje_object_add(evas);
+ wd->o_radio = o;
+ e_theme_edje_object_set(o, "base/theme/widgets",
+ "widgets/radio_icon");
+ edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj);
+ edje_object_part_text_set(o, "label", label);
+ evas_object_show(o);
+
+ if (icon)
+ {
+ o2 = edje_object_add(evas);
+ wd->o_icon = o2;
+ e_util_edje_icon_set(o2, icon);
+ edje_extern_object_min_size_set(o2, icon_w, icon_h);
+ edje_object_part_swallow(wd->o_radio, "icon_swallow", o2);
+ evas_object_show(o2);
+ e_widget_sub_object_add(obj, o2);
+ }
+
+ edje_object_size_min_calc(o, &mw, &mh);
+ e_widget_min_size_set(obj, mw, mh);
+ if ((wd->group) && (wd->group->valptr))
+ {
+ if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o,
"toggle_on", "");
+ }
+ if (wd->group)
+ {
+ wd->group->radios = evas_list_append(wd->group->radios, obj);
+ }
+
+ e_widget_sub_object_add(obj, o);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal, obj);
+ e_widget_resize_object_set(obj, o);
+
+ return obj;
+}
+
EAPI void
e_widget_radio_toggle_set(Evas_Object *obj, int toggle)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_radio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_radio.h 6 May 2006 09:35:05 -0000 1.2
+++ e_widget_radio.h 21 May 2006 11:00:04 -0000 1.3
@@ -10,6 +10,7 @@
EAPI E_Radio_Group *e_widget_radio_group_new(int *val);
EAPI Evas_Object *e_widget_radio_add(Evas *evas, char *label, int valnum,
E_Radio_Group *group);
+EAPI Evas_Object *e_widget_radio_icon_add(Evas *evas, char *label, char *icon,
int icon_w, int icon_h, int valnum, E_Radio_Group *group);
EAPI void e_widget_radio_toggle_set(Evas_Object *obj, int toggle);
#endif
-------------------------------------------------------
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
