From 464e311e6cbc73090e0fe5f5dfd2f60ae0dbc62d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 13 Jul 2012 09:19:35 +0000 Subject: [PATCH] filepreview widget now attempts to show a thumb for file's mime type if file is not an image SVN revision: 73802 --- src/bin/e_utils.c | 18 ++++++++++++ src/bin/e_utils.h | 1 + src/bin/e_widget_filepreview.c | 52 +++++++++++++++++++++++++--------- src/bin/e_widget_filepreview.h | 4 +-- src/bin/e_widget_fsel.c | 4 +-- src/modules/fileman/e_fwin.c | 2 +- 6 files changed, 63 insertions(+), 18 deletions(-) diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index 41ddff44f..44f088395 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -556,6 +556,24 @@ e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon) } } +EAPI const char * +e_util_mime_icon_get(const char *mime, unsigned int size) +{ + char buf[1024]; + const char *file = NULL; + + if (e_config->icon_theme_overrides) + file = efreet_mime_type_icon_get(mime, e_config->icon_theme, e_util_icon_size_normalize(size)); + if (file) return file; + + if (snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", mime) >= (int)sizeof(buf)) + return NULL; + + file = e_theme_edje_file_get("base/theme/icons", buf); + if (file && file[0]) return file; + return efreet_mime_type_icon_get(mime, e_config->icon_theme, e_util_icon_size_normalize(size)); +} + EAPI E_Container * e_util_container_window_find(Ecore_X_Window win) { diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h index 14054c1ac..82dedf16a 100644 --- a/src/bin/e_utils.h +++ b/src/bin/e_utils.h @@ -46,6 +46,7 @@ EAPI int e_util_edje_icon_set(Evas_Object *obj, const char *name); EAPI int e_util_icon_theme_set(Evas_Object *obj, const char *icon); EAPI unsigned int e_util_icon_size_normalize(unsigned int desired); EAPI int e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon); +EAPI const char *e_util_mime_icon_get(const char *mime, unsigned int size); EAPI E_Container *e_util_container_window_find(Ecore_X_Window win); EAPI E_Zone *e_util_zone_window_find(Ecore_X_Window win); EAPI E_Border *e_util_desk_border_above(E_Border *bd); diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c index 862fadb1f..0cbee273b 100644 --- a/src/bin/e_widget_filepreview.c +++ b/src/bin/e_widget_filepreview.c @@ -19,24 +19,28 @@ struct _E_Widget_Data Evas_Object *o_preview_time_entry; Evas_Object *o_preview_preview; Evas_Coord preview_w, preview_h; + int w, h; char *preview_extra_text; char *preview_size_text; char *preview_owner_text; char *preview_perms_text; char *preview_time_text; const char *path; + const char *mime; + Eina_Bool mime_icon : 1; }; -static void _e_wid_fsel_preview_update(void *data, Evas_Object *obj, void *event_info); -static void _e_wid_fsel_preview_file(E_Widget_Data *wd); +static void _e_wid_fprev_preview_update(void *data, Evas_Object *obj, void *event_info); +static void _e_wid_fprev_preview_file(E_Widget_Data *wd, const char *path); static char *_e_wid_file_size_get(off_t st_size); static char *_e_wid_file_user_get(uid_t st_uid); static char *_e_wid_file_perms_get(mode_t st_mode, uid_t st_uid, gid_t gid); static char *_e_wid_file_time_get(time_t st_modtime); +static void _e_wid_fprev_img_update(E_Widget_Data *wd, const char *path); static void _e_wid_del_hook(Evas_Object *obj); static void -_e_wid_fsel_preview_update(void *data, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_fprev_preview_update(void *data, Evas_Object *obj, void *event_info __UNUSED__) { E_Widget_Data *wd; Evas_Object *o; @@ -53,27 +57,46 @@ _e_wid_fsel_preview_update(void *data, Evas_Object *obj, void *event_info __UNUS snprintf(buf, sizeof(buf), "%ix%i", iw, ih); e_widget_entry_text_set(wd->o_preview_extra_entry, buf); } + else if (wd->mime) + { + if (wd->mime_icon) + { + e_widget_label_text_set(wd->o_preview_extra, _("Mime-type:")); + e_widget_entry_text_set(wd->o_preview_extra_entry, wd->mime); + } + else + { + wd->mime_icon = EINA_TRUE; + _e_wid_fprev_img_update(wd, e_util_mime_icon_get(wd->mime, (wd->w > 48) ? 48 : wd->w)); + } + } e_widget_table_object_repack(wd->o_preview_preview_table, wd->o_preview_preview, 0, 0, 1, 1, 0, 0, 1, 1); } static void -_e_wid_fsel_preview_file(E_Widget_Data *wd) +_e_wid_fprev_img_update(E_Widget_Data *wd, const char *path) +{ + if (!path) return; + e_widget_preview_thumb_set(wd->o_preview_preview, path, + "e/desktop/background", wd->w, wd->h); +} + +static void +_e_wid_fprev_preview_file(E_Widget_Data *wd, const char *path) { char *size, *owner, *perms, *mtime; struct stat st; if (stat(wd->path, &st) < 0) return; - + wd->mime_icon = EINA_FALSE; size = _e_wid_file_size_get(st.st_size); owner = _e_wid_file_user_get(st.st_uid); perms = _e_wid_file_perms_get(st.st_mode, st.st_uid, st.st_gid); mtime = _e_wid_file_time_get(st.st_mtime); - e_widget_preview_thumb_set(wd->o_preview_preview, wd->path, - "e/desktop/background", 128, 128); - + _e_wid_fprev_img_update(wd, path); e_widget_table_object_repack(wd->o_preview_preview_table, wd->o_preview_preview, 0, 0, 1, 1, 0, 0, 1, 1); @@ -201,12 +224,13 @@ _e_wid_del_hook(Evas_Object *obj) E_FREE(wd->preview_perms_text); E_FREE(wd->preview_time_text); eina_stringshare_del(wd->path); + eina_stringshare_del(wd->mime); free(wd); } EAPI Evas_Object * -e_widget_filepreview_add(Evas *evas) +e_widget_filepreview_add(Evas *evas, int w, int h) { Evas_Object *obj, *o; int mw, mh; @@ -219,6 +243,7 @@ e_widget_filepreview_add(Evas *evas) e_widget_data_set(obj, wd); wd->obj = obj; + wd->w = w, wd->h = h; o = e_widget_table_add(evas, 0); wd->o_preview_table = o; @@ -230,11 +255,11 @@ e_widget_filepreview_add(Evas *evas) wd->o_preview_preview_table = o; e_widget_sub_object_add(obj, o); - o = e_widget_preview_add(evas, 128, 128); + o = e_widget_preview_add(evas, w, h); wd->o_preview_preview = o; e_widget_sub_object_add(obj, o); evas_object_smart_callback_add(o, "preview_update", - _e_wid_fsel_preview_update, wd); + _e_wid_fprev_preview_update, wd); e_widget_table_object_append(wd->o_preview_preview_table, wd->o_preview_preview, 0, 0, 1, 1, 0, 0, 1, 1); @@ -347,7 +372,7 @@ e_widget_filepreview_add(Evas *evas) } EAPI void -e_widget_filepreview_path_set(Evas_Object *obj, const char *path) +e_widget_filepreview_path_set(Evas_Object *obj, const char *path, const char *mime) { E_Widget_Data *wd; @@ -355,5 +380,6 @@ e_widget_filepreview_path_set(Evas_Object *obj, const char *path) wd = e_widget_data_get(obj); if (!wd) return; eina_stringshare_replace(&wd->path, path); - _e_wid_fsel_preview_file(wd); + eina_stringshare_replace(&wd->mime, mime); + _e_wid_fprev_preview_file(wd, wd->path); } diff --git a/src/bin/e_widget_filepreview.h b/src/bin/e_widget_filepreview.h index b06b6fb4e..8b1278fdd 100644 --- a/src/bin/e_widget_filepreview.h +++ b/src/bin/e_widget_filepreview.h @@ -3,7 +3,7 @@ #ifndef E_WIDGET_FILEPREVIEW_H #define E_WIDGET_FILEPREVIEW_H -EAPI Evas_Object *e_widget_filepreview_add(Evas *evas); -EAPI void e_widget_filepreview_path_set(Evas_Object *obj, const char *path); +EAPI Evas_Object *e_widget_filepreview_add(Evas *evas, int w, int h); +EAPI void e_widget_filepreview_path_set(Evas_Object *obj, const char *path, const char *mime); #endif #endif diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index b2a771695..eda202368 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -212,7 +212,7 @@ _e_wid_fsel_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void eina_stringshare_replace(&wd->path, buf); if (stat(wd->path, &st) == 0) { - if (wd->preview) e_widget_filepreview_path_set(wd->o_preview, wd->path); + if (wd->preview) e_widget_filepreview_path_set(wd->o_preview, wd->path, ici->mime); if (!S_ISDIR(st.st_mode)) e_widget_entry_text_set(wd->o_entry, ici->file); // else @@ -284,7 +284,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, { wd->o_preview_frame = e_widget_framelist_add(evas, _("Preview"), 0); e_widget_sub_object_add(obj, o); - wd->o_preview = e_widget_filepreview_add(evas); + wd->o_preview = e_widget_filepreview_add(evas, 128, 128); e_widget_sub_object_add(obj, wd->o_preview); e_widget_framelist_object_append(wd->o_preview_frame, wd->o_preview); } diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 207b737da..2ab944f7c 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -589,7 +589,7 @@ _e_fwin_icon_popup(void *data) list = e_widget_framelist_add(fwin->popup->evas, fwin->popup_icon->file, 0); o = e_widget_filepreview_add(fwin->popup->evas, mw, mh); snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->cur_page->fm_obj), fwin->popup_icon->file); - e_widget_filepreview_path_set(o, buf); + e_widget_filepreview_path_set(o, buf, fwin->popup_icon->mime); e_widget_framelist_object_append(list, o); e_widget_size_min_get(list, &mw, &mh); edje_extern_object_min_size_set(list, mw, mh);