Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_configure.c e_int_config_background.c
Log Message:
background selector:
- get initial background selector working (thanks chady)
- todo: advanced mode
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_configure.c 17 Dec 2005 11:21:53 -0000 1.16
+++ e_configure.c 18 Dec 2005 10:44:55 -0000 1.17
@@ -63,7 +63,7 @@
e_configure_standard_item_add(eco, "enlightenment/e", _("Menu Settings"),
e_int_config_menus);
e_configure_standard_item_add(eco, "enlightenment/e", _("Window
Manipulation"), e_int_config_window_manipulation);
e_configure_standard_item_add(eco, "enlightenment/e", _("Window Display"),
e_int_config_window_display);
- //e_configure_standard_item_add(eco, "enlightenment/desktops",
_("Background Settings"), e_int_config_background);
+ e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background
Settings"), e_int_config_background);
e_configure_standard_item_add(eco, "enlightenment/modules", _("Module
Settings"), e_int_config_modules);
/* FIXME: we should have a way for modules to hook in here and add their
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_background.c 4 Dec 2005 12:03:58 -0000 1.2
+++ e_int_config_background.c 18 Dec 2005 10:44:55 -0000 1.3
@@ -108,11 +108,9 @@
_e_config_bg_cb_standard(void *data)
{
E_Cfg_Bg_Data *d;
- char *thumb;
d = data;
e_widget_image_object_set(d->cfd->data, e_thumb_evas_object_get(d->file,
d->cfd->dia->win->evas, 160, 120, 1));
- free(thumb);
}
@@ -195,7 +193,7 @@
cb_data->file = strdup(fullbg);
e_widget_ilist_append(il, o, noext,
_e_config_bg_cb_standard, cb_data, fullbg);
- if (!strcmp(e_config->desktop_default_background,
fullbg))
+ if ((e_config->desktop_default_background) &&
!(strcmp(e_config->desktop_default_background, fullbg)))
{
e_widget_ilist_select_set(il, i);
bg = edje_object_add(evas);
@@ -213,7 +211,6 @@
ecore_list_destroy(bgs);
}
}
- cfd->data = im;
e_widget_ilist_go(il);
e_widget_min_size_set(il, 240, 320);
e_widget_table_object_append(o, il, 0, 0, 1, 2, 1, 1, 1, 1);
@@ -224,6 +221,7 @@
e_theme_edje_object_set(bg, "base/theme/background",
"desktop/background");
im = e_widget_image_add_from_object(evas, bg, 160, 120);
}
+ cfd->data = im;
e_widget_min_size_set(fr, 180, 150);
e_widget_table_object_append(o, fr, 1, 0, 1, 1, 1, 1, 1, 1);
e_widget_framelist_object_append(fr, im);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
