Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_int_config_mime.c Log Message: If specified, use edj for the icon in list. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mime.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_mime.c 3 Nov 2006 18:52:39 -0000 1.6 +++ e_int_config_mime.c 3 Nov 2006 19:01:50 -0000 1.7 @@ -151,11 +151,14 @@ E_Config_Mime_Icon *mi; Evas_Object *icon; const char *tmp; + int is_edj = 0; mi = l->data; if (!mi) continue; if (mi->icon) if (!strcmp(mi->icon, "DESKTOP")) continue; + + icon = edje_object_add(evas_object_evas_get(cfdata->gui.list)); tmp = e_fm_mime_icon_get(mi->mime); if (!tmp) @@ -170,12 +173,19 @@ p = strrchr(tmp, '.'); if ((p) && (!strcmp(p, ".edj"))) - snprintf(buf, sizeof(buf), "%s", tmp); + is_edj = 1; } - icon = edje_object_add(evas_object_evas_get(cfdata->gui.list)); - if (!e_theme_edje_object_set(icon, "base/theme/fileman", buf)) - e_theme_edje_object_set(icon, "base/theme/fileman", "e/icons/fileman/file"); - e_widget_ilist_append(cfdata->gui.list, icon, mi->mime, _list_cb_sel, cfdata, NULL); + if (is_edj) + { + if (!e_theme_edje_object_set(icon, tmp, "icon")) + e_theme_edje_object_set(icon, "base/theme/fileman", "e/icons/fileman/file"); + } + else + { + if (!e_theme_edje_object_set(icon, "base/theme/fileman", buf)) + e_theme_edje_object_set(icon, "base/theme/fileman", "e/icons/fileman/file"); + } + e_widget_ilist_append(cfdata->gui.list, icon, mi->mime, _list_cb_sel, cfdata, NULL); } e_widget_ilist_go(cfdata->gui.list); e_widget_min_size_get(cfdata->gui.list, &w, &h); ------------------------------------------------------------------------- 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