The following commit is of interest to end users. In the following weeks I'll be working on enlightenment dr17 file manager in order to make it more freedesktop.org compliant. Dave will also work on integrating "Places" module back into it. While doing such work you may experience bugs and some settings to be required, so ask help in case of problems. We hope things to stabilize and prepare things for the official release! See http://trac.enlightenment.org/e/wiki/Release
Regards, ---------- Forwarded message ---------- From: Enlightenment SVN <no-re...@enlightenment.org> Date: Tue, Mar 3, 2009 at 5:17 PM Subject: E SVN: barbieri IN trunk/e: config/illume config/minimalist config/netbook config/scaleable config/standard src/bin To: enlightenment-...@lists.sourceforge.net Log: Fix edje thumbnails. Please add the following to your /etc/mime.types: application/x-edje edj And the following to your ~/.e/e/config/$PROFILE/e.cfg (see hint below): group "mime_icons" list { group "E_Config_Mime_Icon" struct { value "mime" string: "application/x-edje"; value "icon" string: "THUMB"; } } or just remove your settings and choose a newly installed profile. How to edit your ~/.e/e/config/$PROFILE/e.cfg: PROFILE=`eet -x ~/.e/e/config/profile.cfg config /dev/stdout` eet -d ~/.e/e/config/$PROFILE/e.cfg config ~/.e/e/config/$PROFILE/e.src $EDITOR ~/.e/e/config/$PROFILE/e.src eet -e ~/.e/e/config/$PROFILE/e.cfg config ~/.e/e/config/$PROFILE/e.src 1 Author: barbieri Date: 2009-03-03 12:17:17 -0800 (Tue, 03 Mar 2009) New Revision: 39348 Modified: trunk/e/config/illume/e.src trunk/e/config/minimalist/e.src trunk/e/config/netbook/e.src trunk/e/config/scaleable/e.src trunk/e/config/standard/e.src trunk/e/src/bin/e_fm.c Modified: trunk/e/config/illume/e.src =================================================================== --- trunk/e/config/illume/e.src 2009-03-03 20:02:40 UTC (rev 39347) +++ trunk/e/config/illume/e.src 2009-03-03 20:17:17 UTC (rev 39348) @@ -749,6 +749,12 @@ } group "mime_icons" list { group "E_Config_Mime_Icon" struct { + value "mime" string: "application/x-edje"; + value "icon" string: "THUMB"; + } + } + group "mime_icons" list { + group "E_Config_Mime_Icon" struct { value "mime" string: "application/x-desktop"; value "icon" string: "DESKTOP"; } Modified: trunk/e/config/minimalist/e.src =================================================================== --- trunk/e/config/minimalist/e.src 2009-03-03 20:02:40 UTC (rev 39347) +++ trunk/e/config/minimalist/e.src 2009-03-03 20:17:17 UTC (rev 39348) @@ -1953,6 +1953,12 @@ } group "mime_icons" list { group "E_Config_Mime_Icon" struct { + value "mime" string: "application/x-edje"; + value "icon" string: "THUMB"; + } + } + group "mime_icons" list { + group "E_Config_Mime_Icon" struct { value "mime" string: "application/x-desktop"; value "icon" string: "DESKTOP"; } Modified: trunk/e/config/netbook/e.src =================================================================== --- trunk/e/config/netbook/e.src 2009-03-03 20:02:40 UTC (rev 39347) +++ trunk/e/config/netbook/e.src 2009-03-03 20:17:17 UTC (rev 39348) @@ -2017,6 +2017,12 @@ } group "mime_icons" list { group "E_Config_Mime_Icon" struct { + value "mime" string: "application/x-edje"; + value "icon" string: "THUMB"; + } + } + group "mime_icons" list { + group "E_Config_Mime_Icon" struct { value "mime" string: "application/x-desktop"; value "icon" string: "DESKTOP"; } Modified: trunk/e/config/scaleable/e.src =================================================================== --- trunk/e/config/scaleable/e.src 2009-03-03 20:02:40 UTC (rev 39347) +++ trunk/e/config/scaleable/e.src 2009-03-03 20:17:17 UTC (rev 39348) @@ -2040,6 +2040,12 @@ } group "mime_icons" list { group "E_Config_Mime_Icon" struct { + value "mime" string: "application/x-edje"; + value "icon" string: "THUMB"; + } + } + group "mime_icons" list { + group "E_Config_Mime_Icon" struct { value "mime" string: "application/x-desktop"; value "icon" string: "DESKTOP"; } Modified: trunk/e/config/standard/e.src =================================================================== --- trunk/e/config/standard/e.src 2009-03-03 20:02:40 UTC (rev 39347) +++ trunk/e/config/standard/e.src 2009-03-03 20:17:17 UTC (rev 39348) @@ -2050,6 +2050,12 @@ } group "mime_icons" list { group "E_Config_Mime_Icon" struct { + value "mime" string: "application/x-edje"; + value "icon" string: "THUMB"; + } + } + group "mime_icons" list { + group "E_Config_Mime_Icon" struct { value "mime" string: "application/x-desktop"; value "icon" string: "DESKTOP"; } Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2009-03-03 20:02:40 UTC (rev 39347) +++ trunk/e/src/bin/e_fm.c 2009-03-03 20:17:17 UTC (rev 39348) @@ -401,6 +401,7 @@ static const char *_e_fm2_icon_thumb_str = NULL; static const char *_e_fm2_mime_inode_directory = NULL; static const char *_e_fm2_mime_app_desktop = NULL; +static const char *_e_fm2_mime_app_edje = NULL; static Ecore_Timer *_e_fm2_mime_flush = NULL; static Ecore_Timer *_e_fm2_mime_clear = NULL; @@ -598,6 +599,7 @@ _e_fm2_icon_thumb_str = eina_stringshare_add("THUMB"); _e_fm2_mime_inode_directory = eina_stringshare_add("inode/directory"); _e_fm2_mime_app_desktop = eina_stringshare_add("application/x-desktop"); + _e_fm2_mime_app_edje = eina_stringshare_add("application/x-edje"); return 1; } @@ -609,6 +611,7 @@ _eina_stringshare_replace(&_e_fm2_icon_thumb_str, NULL); _eina_stringshare_replace(&_e_fm2_mime_inode_directory, NULL); _eina_stringshare_replace(&_e_fm2_mime_app_desktop, NULL); + _eina_stringshare_replace(&_e_fm2_mime_app_edje, NULL); ecore_timer_del(_e_fm2_mime_flush); _e_fm2_mime_flush = NULL; @@ -1529,7 +1532,7 @@ * @see _e_fm2_icon_explicit_get() */ static Evas_Object * -_e_fm2_icon_explicit_edje_get(Evas *evas, const E_Fm2_Icon *ic, const char *iconpath, const char **type_ret) +_e_fm2_icon_explicit_edje_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__, const char *iconpath, const char **type_ret) { Evas_Object *o = edje_object_add(evas); if (!o) @@ -1554,7 +1557,7 @@ * @see _e_fm2_icon_explicit_get() */ static Evas_Object * -_e_fm2_icon_explicit_theme_icon_get(Evas *evas, const E_Fm2_Icon *ic, const char *name, const char **type_ret) +_e_fm2_icon_explicit_theme_icon_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__, const char *name, const char **type_ret) { Evas_Object *o = edje_object_add(evas); if (!o) @@ -1840,8 +1843,14 @@ if (icon == _e_fm2_icon_desktop_str) return _e_fm2_icon_desktop_get(evas, ic, type_ret); else if (icon == _e_fm2_icon_thumb_str) - return _e_fm2_icon_thumb_get(evas, ic, NULL, - gen_func, data, force_gen, type_ret); + { + if (ic->info.mime == _e_fm2_mime_app_edje) + return _e_fm2_icon_thumb_edje_get + (evas, ic, gen_func, data, force_gen, type_ret); + else + return _e_fm2_icon_thumb_get + (evas, ic, NULL, gen_func, data, force_gen, type_ret); + } else if (strncmp(icon, "e/icons/fileman/mime/", 21) == 0) return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 21 - 5, type_ret); else ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ enlightenment-svn mailing list enlightenment-...@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-svn -- Gustavo Sverzut Barbieri http://profusion.mobi embedded systems -------------------------------------- MSN: barbi...@gmail.com Skype: gsbarbieri Mobile: +55 (19) 9225-2202 ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ enlightenment-users mailing list enlightenment-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-users