Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_background.c
Log Message:
Add preview for theme background. Has sizing issues still tho
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_config_background.c 15 Jan 2006 07:11:02 -0000 1.18
+++ e_int_config_background.c 17 Jan 2006 00:41:18 -0000 1.19
@@ -23,7 +23,7 @@
{
E_Config_Dialog *cfd;
/*- BASIC -*/
- char *file ;
+ char *file;
char *current_file;
/*- ADVANCED -*/
int bg_method;
@@ -119,11 +119,12 @@
cfdata = data;
if (strlen(cfdata->file) == 0)
{
- Evas_Object *bg;
+ Evas_Object *bg, *im;
bg = edje_object_add(cfdata->cfd->dia->win->evas);
e_theme_edje_object_set(bg, "base/theme/background",
"desktop/background");
- e_widget_image_object_set(cfdata->cfd->data, bg);
+ im = e_widget_image_add_from_object(cfdata->cfd->dia->win->evas, bg,
160, 120);
+ e_widget_image_object_set(cfdata->cfd->data, im);
}
else
{
@@ -268,14 +269,11 @@
oc = e_widget_radio_add(evas, _("Default Desktop"), BG_SET_DEFAULT_DESK,
rg);
e_widget_framelist_object_append(fr, oc);
oc = e_widget_radio_add(evas, _("This Desktop"), BG_SET_THIS_DESK, rg);
-// e_widget_disabled_set(oc, 1);
e_widget_framelist_object_append(fr, oc);
oc = e_widget_radio_add(evas, _("All Desktops"), BG_SET_ALL_DESK, rg);
-// e_widget_disabled_set(oc, 1);
e_widget_framelist_object_append(fr, oc);
e_widget_table_object_append(o, fr, 1, 1, 1, 1, 1, 1, 1, 1);
-
return o;
}
@@ -288,7 +286,7 @@
char *homedir;
E_Zone *z;
int iw, ih, pw, ph;
- Evas_Object *oi;
+ Evas_Object *oi = NULL;
homedir = e_user_homedir_get();
if (homedir)
@@ -313,13 +311,18 @@
pw = ((double)z->w * ph) / (double)z->h;
}
- oi = evas_object_rectangle_add(evas);
- evas_object_color_set(oi, 0, 0, 0, 0);
- e_widget_ilist_append(il, oi, _("Theme Background"),
- _e_config_bg_cb_standard, cfd->cfdata, "");
+ bg = edje_object_add(evas);
+ e_theme_edje_object_set(bg, "base/theme/background", "desktop/background");
+ evas_object_resize(bg, iw, ih);
+ e_widget_ilist_append(il, bg, _("Theme Background"),
_e_config_bg_cb_standard, cfd->cfdata, "");
- if ((!e_config->desktop_default_background))
- e_widget_ilist_selected_set(il, 0);
+ if ((!e_config->desktop_default_background))
+ {
+ e_widget_ilist_selected_set(il, 0);
+ oi = edje_object_add(evas);
+ e_theme_edje_object_set(oi, "base/theme/background",
"desktop/background");
+ im = e_widget_image_add_from_object(evas, oi, pw, ph);
+ }
if (ecore_file_is_dir(buf))
{
@@ -330,7 +333,6 @@
{
char *bgfile;
char fullbg[PATH_MAX];
- Evas_Object *o, *otmp;
int i = 1;
while ((bgfile = ecore_list_next(bgs)))
@@ -355,7 +357,7 @@
bg = edje_object_add(evas);
edje_object_file_set(bg,
e_config->desktop_default_background, "desktop/background");
im = e_widget_image_add_from_object(evas, bg, pw,
ph);
- e_widget_image_object_set(im,
e_thumb_evas_object_get(fullbg, evas, 160, 120, 1));
+ e_widget_image_object_set(im,
e_thumb_evas_object_get(fullbg, evas, pw, ph, 1));
}
free(noext);
i++;
@@ -365,14 +367,6 @@
ecore_list_destroy(bgs);
}
}
-
- if (im == NULL)
- {
- bg = edje_object_add(evas);
- e_theme_edje_object_set(bg, "base/theme/background",
"desktop/background");
- im = e_widget_image_add_from_object(evas, bg, pw, ph);
- }
-
cfd->data = 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
