enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

New function e_util_menu_item_fdo_icon_set() and use it 

SVN revision: 39349
This commit is contained in:
Davide Andreoli 2009-03-03 20:17:41 +00:00
parent 43a27176be
commit 0a61c86043
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_utils.c
View File

@ -397,6 +397,19 @@ e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name)
return 0;
}
EAPI int
e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon)
{
char *path = NULL;
if ((!icon) || (!icon[0])) return 0;
path = efreet_icon_path_find(e_config->icon_theme, icon, 16);
if (!path) return 0;
e_menu_item_icon_file_set(mi, path);
E_FREE(path);
return 1;
}
EAPI E_Container *
e_util_container_window_find(Ecore_X_Window win)
{

1
src/bin/e_utils.h
View File

@ -33,6 +33,7 @@ EAPI int e_util_menu_item_edje_icon_list_set(E_Menu_Item *mi, const cha
EAPI int e_util_edje_icon_check(const char *name);
EAPI int e_util_edje_icon_set(Evas_Object *obj, const char *name);
EAPI int e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name);
EAPI int e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon);
EAPI E_Container *e_util_container_window_find(Ecore_X_Window win);
EAPI E_Border *e_util_desk_border_above(E_Border *bd);
EAPI E_Border *e_util_desk_border_below(E_Border *bd);

21
src/modules/fileman/e_mod_main.c
View File

@ -316,39 +316,33 @@ _e_mod_menu_generate(void *data, E_Menu *m)
/* Home */
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Home"));
e_util_menu_item_edje_icon_set(mi, "fileman/home");
e_util_menu_item_fdo_icon_set(mi, "user-home");
e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "~/");
/* Desktop */
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Desktop"));
e_util_menu_item_edje_icon_set(mi, "fileman/desktop");
e_util_menu_item_fdo_icon_set(mi, "user-desktop");
e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "desktop");
/* Favorites */
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Favorites"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/favorites");
e_util_menu_item_fdo_icon_set(mi, "folder-bookmarks");
e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "favorites");
/* Trash */
//~ mi = e_menu_item_new(em);
//~ e_menu_item_label_set(mi, D_("Trash"));
//~ e_util_menu_item_edje_icon_set(mi, "fileman/folder");
//~ e_util_menu_item_fdo_icon_set(mi, "user-trash");
//~ e_menu_item_callback_set(mi, _places_run_fm, "trash:///");
/* Root */
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Root"));
e_util_menu_item_edje_icon_set(mi, "fileman/root");
e_util_menu_item_fdo_icon_set(mi, "computer");
e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "/");
/* Temp */
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Temporary"));
e_util_menu_item_edje_icon_set(mi, "fileman/tmp");
e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "temp");
//separator
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@ -357,15 +351,12 @@ _e_mod_menu_generate(void *data, E_Menu *m)
Eina_Bool volumes_visible = 0;
EINA_LIST_FOREACH(e_fm2_hal_volume_list_get(), l, vol)
{
char *icon;
if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, vol->label);
icon = efreet_icon_path_find(e_config->icon_theme, vol->icon, 16);
e_menu_item_icon_file_set(mi, icon);
e_util_menu_item_fdo_icon_set(mi, vol->icon);
e_menu_item_callback_set(mi, _e_mod_menu_volume_cb, vol);
volumes_visible = 1;
if (icon) free(icon);
}
/* Favorites */