Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_theme.c e_widget_button.c
Log Message:
Allow setting a widget_button's icon to NULL so that a button icon can be
unset.
Some formatting on the theme dialog.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_int_config_theme.c 15 Jan 2007 17:43:19 -0000 1.44
+++ e_int_config_theme.c 28 Feb 2007 02:58:39 -0000 1.45
@@ -355,13 +355,11 @@
rg = e_widget_radio_group_new(&(cfdata->fmdir));
o = e_widget_radio_add(evas, _("Personal"), 0, rg);
cfdata->o_personal = o;
- evas_object_smart_callback_add(o, "changed",
- _cb_dir, cfdata);
+ evas_object_smart_callback_add(o, "changed", _cb_dir, cfdata);
e_widget_table_object_append(il, o, 0, 0, 1, 1, 1, 1, 0, 0);
o = e_widget_radio_add(evas, _("System"), 1, rg);
cfdata->o_system = o;
- evas_object_smart_callback_add(o, "changed",
- _cb_dir, cfdata);
+ evas_object_smart_callback_add(o, "changed", _cb_dir, cfdata);
e_widget_table_object_append(il, o, 1, 0, 1, 1, 1, 1, 0, 0);
e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0);
@@ -431,11 +429,12 @@
o = e_widget_preview_add(evas, 320, (320 * z->h) / z->w);
cfdata->o_preview = o;
- if (cfdata->theme)
- f = cfdata->theme;
- e_widget_preview_edje_set(o, f, "e/desktop/background");
+ if (cfdata->theme)
+ {
+ f = cfdata->theme;
+ e_widget_preview_edje_set(o, f, "e/desktop/background");
+ }
e_widget_list_object_append(of, o, 1, 1, 0.5);
-
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
e_dialog_resizable_set(cfd->dia, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_button.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_widget_button.c 23 Aug 2006 03:39:02 -0000 1.13
+++ e_widget_button.c 28 Feb 2007 02:58:40 -0000 1.14
@@ -86,13 +86,24 @@
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
- wd->o_icon = icon;
- edje_object_part_swallow(wd->o_button, "e.swallow.icon", icon);
- edje_object_signal_emit(wd->o_button, "e,action,show,icon", "e");
- edje_object_message_signal_process(wd->o_button);
- evas_object_pass_events_set(icon, 1);
- evas_object_show(icon);
- e_widget_sub_object_add(obj, icon);
+ if (!icon)
+ {
+ evas_object_hide(wd->o_icon);
+ edje_object_signal_emit(wd->o_button, "e,action,hide,icon", "e");
+ edje_object_message_signal_process(wd->o_button);
+ edje_object_part_unswallow(wd->o_button, wd->o_icon);
+ evas_object_del(wd->o_icon);
+ }
+ else
+ {
+ wd->o_icon = icon;
+ edje_object_part_swallow(wd->o_button, "e.swallow.icon", icon);
+ edje_object_signal_emit(wd->o_button, "e,action,show,icon", "e");
+ edje_object_message_signal_process(wd->o_button);
+ evas_object_pass_events_set(icon, 1);
+ evas_object_show(icon);
+ e_widget_sub_object_add(obj, icon);
+ }
}
static void
-------------------------------------------------------------------------
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
