Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_dialog.c e_gadman.c e_test.c
Log Message:
oopsie - fix gadman zone fetch res match
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_dialog.c 18 Sep 2005 06:27:47 -0000 1.5
+++ e_dialog.c 19 Sep 2005 04:28:22 -0000 1.6
@@ -8,7 +8,7 @@
struct _E_Dialog_Button
{
E_Dialog *dialog;
- Evas_Object *obj;
+ Evas_Object *obj, *obj_icon;
char *label;
char *icon;
void (*func) (void *data, E_Dialog *dia);
@@ -92,6 +92,16 @@
edje_object_signal_callback_add(db->obj, "click", "",
_e_dialog_cb_button_clicked, db);
edje_object_part_text_set(db->obj, "button_text", db->label);
+ if (icon)
+ {
+ db->obj_icon = edje_object_add(e_win_evas_get(dia->win));
+ e_util_edje_icon_set(db->obj_icon, icon);
+ edje_object_part_swallow(db->obj, "icon_swallow", db->obj_icon);
+ edje_object_signal_emit(db->obj, "icon_visible", "");
+ 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,
@@ -160,6 +170,7 @@
E_FREE(db->label);
E_FREE(db->icon);
evas_object_del(db->obj);
+ if (db->obj_icon) evas_object_del(db->obj_icon);
free(db);
}
if (dia->text_object) evas_object_del(dia->text_object);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_gadman.c 5 Sep 2005 15:24:07 -0000 1.45
+++ e_gadman.c 19 Sep 2005 04:28:22 -0000 1.46
@@ -282,12 +282,15 @@
{
cf2 = (Gadman_Client_Config *)l->data;
zone = e_container_zone_number_get(gmc->zone->container,
cf2->zone);
- if ((zone->w == cf2->res.w) && (zone->h == cf2->res.h))
+ if (zone)
{
- l = cf->res.others;
- *cf = *cf2;
- cf->res.others = l;
- break;
+ if ((zone->w == cf2->res.w) && (zone->h == cf2->res.h))
+ {
+ l = cf->res.others;
+ *cf = *cf2;
+ cf->res.others = l;
+ break;
+ }
}
}
E_CONFIG_LIMIT(cf->pos.x, 0, 10000);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_test.c 18 Sep 2005 06:30:19 -0000 1.14
+++ e_test.c 19 Sep 2005 04:28:22 -0000 1.15
@@ -300,9 +300,10 @@
e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del);
e_dialog_title_set(dia, "A Test Dialog");
e_dialog_text_set(dia, "A Test Dialog<br>And another
line<br><hilight>Hilighted Text</hilight>");
+ e_dialog_icon_set(dia, "enlightenment/modules");
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
- e_dialog_button_add(dia, "Apply", NULL, NULL, NULL);
- e_dialog_button_add(dia, "Cancel", NULL, NULL, NULL);
+ e_dialog_button_add(dia, "Apply", "enlightenment/reset", NULL, NULL);
+ e_dialog_button_add(dia, "Cancel", "enlightenment/exit", NULL, NULL);
e_dialog_show(dia);
}
#elif 0
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
