enlightenment
/
enlightenment
5
6
Fork 8
Code Issues 17 Pull Requests Projects Releases Wiki Activity

* Rename the new function:

Browse Source 
e_util_menu_item_fdo_icon_set to e_util_menu_item_theme_icon_set
As it looks for icons in e theme AND in fdo icon themes.
* Use the new function everywere instead of e_util_menu_item_edje_icon_set,
that is now marked as DEPRECATED

You should not see any difference with this commit. With the next few commit I'm
going to rename all the icons in the theme following fdo standard. I will not change
any icons, just rename them to match fdo ones.



SVN revision: 39370
devs/princeamd/enlightenment-0.17-elive
Davide Andreoli 14 years ago
parent 1f986f4b28
commit 3d669d1177
22 changed files with 103 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/bin/e_fm.c
  2. 16
      src/bin/e_gadcon.c
  3. 6
      src/bin/e_int_border_menu.c
  4. 74
      src/bin/e_int_menus.c
  5. 10
      src/bin/e_shelf.c
  6. 8
      src/bin/e_toolbar.c
  7. 15
      src/bin/e_utils.c
  8. 2
      src/bin/e_utils.h
  9. 2
      src/modules/battery/e_mod_main.c
  10. 2
      src/modules/conf/e_mod_main.c
  11. 2
      src/modules/conf_shelves/e_mod_main.c
  12. 2
      src/modules/conf_theme/e_mod_main.c
  13. 2
      src/modules/conf_wallpaper/e_mod_main.c
  14. 2
      src/modules/exebuf/e_mod_main.c
  15. 16
      src/modules/fileman/e_mod_main.c
  16. 10
      src/modules/gadman/e_mod_gadman.c
  17. 14
      src/modules/ibar/e_mod_main.c
  18. 4
      src/modules/ibox/e_mod_main.c
  19. 2
      src/modules/mixer/e_mod_main.c
  20. 4
      src/modules/pager/e_mod_main.c
  21. 2
      src/modules/syscon/e_mod_main.c
  22. 2
      src/modules/temperature/e_mod_main.c

6
src/bin/e_fm.c
Unescape View File

@ -7050,7 +7050,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("View Mode"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
}
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@ -7233,7 +7233,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("View Mode"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
}
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@ -7529,7 +7529,7 @@ _e_fm2_context_menu_append(Evas_Object *obj, const char *path, Eina_List *l, E_M
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, handler->label);
if (handler->icon_group)
e_util_menu_item_edje_icon_set(mi, handler->icon_group);
e_util_menu_item_theme_icon_set(mi, handler->icon_group);
e_menu_item_callback_set(mi, _e_fm2_icon_menu_item_cb, md);
}
}

16
src/bin/e_gadcon.c
Unescape View File

@ -1246,7 +1246,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
mn = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Plain"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/plain");
e_util_menu_item_theme_icon_set(mi, "enlightenment/plain");
e_menu_item_radio_group_set(mi, 1);
e_menu_item_radio_set(mi, 1);
if ((gcc->style) && (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_PLAIN)))
@ -1255,7 +1255,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Inset"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/inset");
e_util_menu_item_theme_icon_set(mi, "enlightenment/inset");
e_menu_item_radio_group_set(mi, 1);
e_menu_item_radio_set(mi, 1);
if ((gcc->style) && (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_INSET)))
@ -1264,7 +1264,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Appearance"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_menu_item_submenu_set(mi, mn);
}
@ -1272,14 +1272,14 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
{
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Automatically scroll contents"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/autoscroll");
e_util_menu_item_theme_icon_set(mi, "enlightenment/autoscroll");
e_menu_item_check_set(mi, 1);
if (gcc->autoscroll) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_autoscroll, gcc);
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Able to be resized"));
e_util_menu_item_edje_icon_set(mi, "widget/resize");
e_util_menu_item_theme_icon_set(mi, "widget/resize");
e_menu_item_check_set(mi, 1);
if (gcc->resizable) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_resizable, gcc);
@ -1291,13 +1291,13 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
{
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Begin move/resize this gadget"));
e_util_menu_item_edje_icon_set(mi, "widget/resize");
e_util_menu_item_theme_icon_set(mi, "widget/resize");
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
}
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Remove this gadget"));
e_util_menu_item_edje_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc);
}
if (gcc->gadcon->menu_attach.func)
@ -1723,7 +1723,7 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *e
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Stop move/resize this gadget"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/edit");
e_util_menu_item_theme_icon_set(mi, "enlightenment/edit");
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
if (gcc->gadcon->menu_attach.func)

6
src/bin/e_int_border_menu.c
Unescape View File

@ -476,19 +476,19 @@ _e_border_menu_cb_application_add_pre(void *data, E_Menu *m, E_Menu_Item *mi)
submi = e_menu_item_new(subm);
e_menu_item_label_set(submi, _("Keyboard Shortcut"));
e_menu_item_callback_set(submi, _e_border_menu_cb_kbdshrtct_add, bd);
e_util_menu_item_edje_icon_set(submi, "enlightenment/keys");
e_util_menu_item_theme_icon_set(submi, "enlightenment/keys");
}
submi = e_menu_item_new(subm);
e_menu_item_label_set(submi, _("To Favorites Menu"));
e_menu_item_callback_set(submi, _e_border_menu_cb_fav_add, bd);
e_util_menu_item_edje_icon_set(submi, "enlightenment/favorites");
e_util_menu_item_theme_icon_set(submi, "enlightenment/favorites");
submi = e_menu_item_new(subm);
e_menu_item_label_set(submi, _("To Launcher"));
e_menu_item_submenu_pre_callback_set(submi,
_e_border_menu_cb_ibar_add_pre, bd);
e_util_menu_item_edje_icon_set(submi, "enlightenment/ibar_applications");
e_util_menu_item_theme_icon_set(submi, "enlightenment/ibar_applications");
}
static void

74
src/bin/e_int_menus.c
Unescape View File

@ -96,7 +96,7 @@ e_int_menus_main_new(void)
dat->apps = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Favorite Applications"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/favorites");
e_util_menu_item_theme_icon_set(mi, "enlightenment/favorites");
e_menu_item_submenu_set(mi, subm);
}
}
@ -107,7 +107,7 @@ e_int_menus_main_new(void)
dat->all_apps = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Applications"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/applications");
e_util_menu_item_theme_icon_set(mi, "enlightenment/applications");
e_menu_item_submenu_set(mi, subm);
}
@ -124,7 +124,7 @@ e_int_menus_main_new(void)
dat->desktops = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Desktop"));
e_util_menu_item_fdo_icon_set(mi, "preferences-desktop");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
e_menu_item_submenu_set(mi, subm);
subm = e_int_menus_clients_new();
@ -132,7 +132,7 @@ e_int_menus_main_new(void)
dat->clients = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Windows"));
e_util_menu_item_fdo_icon_set(mi, "preferences-system-windows");
e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
e_menu_item_submenu_set(mi, subm);
/*
subm = e_int_menus_lost_clients_new();
@ -140,7 +140,7 @@ e_int_menus_main_new(void)
dat->lost_clients = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Lost Windows"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/lost_windows");
e_util_menu_item_theme_icon_set(mi, "enlightenment/lost_windows");
e_menu_item_submenu_set(mi, subm);
*/
@ -157,17 +157,17 @@ e_int_menus_main_new(void)
dat->enlightenment = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Enlightenment"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/e");
e_util_menu_item_theme_icon_set(mi, "enlightenment/e");
e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("About"));
e_util_menu_item_fdo_icon_set(mi, "help-about");
e_util_menu_item_theme_icon_set(mi, "help-about");
e_menu_item_callback_set(mi, _e_int_menus_main_about, NULL);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Theme"));
e_util_menu_item_fdo_icon_set(mi, "preferences-desktop-theme");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
l = eina_hash_find(_e_int_menus_augmentation, "main/5");
@ -181,12 +181,12 @@ e_int_menus_main_new(void)
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Restart"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/reset");
e_util_menu_item_theme_icon_set(mi, "enlightenment/reset");
e_menu_item_callback_set(mi, _e_int_menus_main_restart, NULL);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Exit"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/exit");
e_util_menu_item_theme_icon_set(mi, "enlightenment/exit");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
l = eina_hash_find(_e_int_menus_augmentation, "main/7");
@ -202,7 +202,7 @@ e_int_menus_main_new(void)
dat->config = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_fdo_icon_set(mi, "preferences-system");
e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_submenu_set(mi, subm);
l = eina_hash_find(_e_int_menus_augmentation, "main/9");
@ -254,14 +254,14 @@ e_int_menus_desktops_new(void)
subm = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Virtual"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops");
e_util_menu_item_theme_icon_set(mi, "enlightenment/desktops");
e_menu_pre_activate_callback_set(subm, _e_int_menus_virtuals_pre_cb, NULL);
e_menu_item_submenu_set(mi, subm);
subm = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Shelves"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf");
e_menu_pre_activate_callback_set(subm, _e_int_menus_shelves_pre_cb, NULL);
e_menu_item_submenu_set(mi, subm);
@ -270,7 +270,7 @@ e_int_menus_desktops_new(void)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Show/Hide All Windows"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/showhide");
e_util_menu_item_theme_icon_set(mi, "enlightenment/showhide");
e_menu_item_callback_set(mi, _e_int_menus_main_showhide, NULL);
return m;
@ -490,7 +490,7 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
if (entry->icon[0] == '/')
e_menu_item_icon_file_set(mi, entry->icon);
else
e_util_menu_item_fdo_icon_set(mi, entry->icon);
e_util_menu_item_theme_icon_set(mi, entry->icon);
}
if (entry->type == EFREET_MENU_ENTRY_SEPARATOR)
e_menu_item_separator_set(mi, 1);
@ -645,7 +645,7 @@ _e_int_menus_virtuals_pre_cb(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Configure Virtual Desktops"));
e_util_menu_item_fdo_icon_set(mi, "preferences-desktop");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
e_menu_item_callback_set(mi, _e_int_menus_desk_item_cb, NULL);
}
}
@ -712,7 +712,7 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m)
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Modules"));
e_util_menu_item_fdo_icon_set(mi, "preferences-plugin");
e_util_menu_item_theme_icon_set(mi, "preferences-plugin");
e_menu_item_callback_set(mi, _e_int_menus_module_item_cb, NULL);
}
@ -873,7 +873,7 @@ _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m)
if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, bd->client.icccm.class);
e_util_menu_item_edje_icon_set(mi, "enlightenment/windows");
e_util_menu_item_theme_icon_set(mi, "enlightenment/windows");
subm = e_menu_new();
}
else
@ -953,7 +953,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
if (subm && mi) e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, bd->desk->name);
e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops");
e_util_menu_item_theme_icon_set(mi, "enlightenment/desktops");
subm = e_menu_new();
}
else
@ -1072,7 +1072,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Cleanup Windows"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/windows");
e_util_menu_item_theme_icon_set(mi, "enlightenment/windows");
e_menu_item_callback_set(mi, _e_int_menus_clients_cleanup_cb, zone);
if (dat)
@ -1085,7 +1085,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
dat->lost_clients = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Lost Windows"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/lost_windows");
e_util_menu_item_theme_icon_set(mi, "enlightenment/lost_windows");
e_menu_item_submenu_set(mi, subm);
}
@ -1336,43 +1336,43 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
switch (s->cfg->orient)
{
case E_GADCON_ORIENT_LEFT:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_left");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_left");
break;
case E_GADCON_ORIENT_RIGHT:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_right");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_right");
break;
case E_GADCON_ORIENT_TOP:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_top");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_top");
break;
case E_GADCON_ORIENT_BOTTOM:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_bottom");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_bottom");
break;
case E_GADCON_ORIENT_CORNER_TL:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_top_left");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_top_left");
break;
case E_GADCON_ORIENT_CORNER_TR:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_top_right");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_top_right");
break;
case E_GADCON_ORIENT_CORNER_BL:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_bottom_left");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_bottom_left");
break;
case E_GADCON_ORIENT_CORNER_BR:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_bottom_right");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_bottom_right");
break;
case E_GADCON_ORIENT_CORNER_LT:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_left_top");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_left_top");
break;
case E_GADCON_ORIENT_CORNER_RT:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_right_top");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_right_top");
break;
case E_GADCON_ORIENT_CORNER_LB:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_left_bottom");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_left_bottom");
break;
case E_GADCON_ORIENT_CORNER_RB:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf_position_right_bottom");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_right_bottom");
break;
default:
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf");
break;
}
}
@ -1381,16 +1381,16 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Add A Shelf"));
e_util_menu_item_fdo_icon_set(mi, "list-add");
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _e_int_menus_shelves_add_cb, NULL);
if (shelves)
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Delete A Shelf"));
e_util_menu_item_fdo_icon_set(mi, "list-remove");
e_util_menu_item_theme_icon_set(mi, "list-remove");
e_menu_item_callback_set(mi, _e_int_menus_shelves_del_cb, NULL);
}
}
}
static void

10
src/bin/e_shelf.c
Unescape View File

@ -1105,7 +1105,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
subm = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, buf);
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf");
e_menu_pre_activate_callback_set(subm, _e_shelf_menu_pre_cb, es);
e_object_free_attach_func_set(E_OBJECT(mi), _e_shelf_menu_item_free);
e_object_data_set(E_OBJECT(mi), es);
@ -1665,7 +1665,7 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
else
e_menu_item_label_set(mi, _("Begin Moving/Resizing Items"));
e_util_menu_item_edje_icon_set(mi, "widget/resize");
e_util_menu_item_theme_icon_set(mi, "widget/resize");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es);
mi = e_menu_item_new(m);
@ -1673,16 +1673,16 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Shelf Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Configure Shelf Contents"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_contents, es);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Delete this Shelf"));
e_util_menu_item_edje_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_delete, es);
}

8
src/bin/e_toolbar.c
Unescape View File

@ -316,7 +316,7 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
else
e_menu_item_label_set(mi, _("Begin Moving/Resizing Items"));
e_util_menu_item_edje_icon_set(mi, "widget/resize");
e_util_menu_item_theme_icon_set(mi, "widget/resize");
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_edit, tbar);
mi = e_menu_item_new(mn);
@ -324,12 +324,12 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Toolbar Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_config, tbar);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Configure Toolbar Contents"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/toolbar");
e_util_menu_item_theme_icon_set(mi, "enlightenment/toolbar");
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_contents, tbar);
}
@ -351,7 +351,7 @@ _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn)
subm = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, tbar->name);
e_util_menu_item_edje_icon_set(mi, "enlightenment/toolbar");
e_util_menu_item_theme_icon_set(mi, "enlightenment/toolbar");
e_menu_pre_activate_callback_set(subm, _e_toolbar_menu_cb_pre, tbar);
e_menu_item_submenu_set(mi, subm);
}

15
src/bin/e_utils.c
Unescape View File

@ -335,14 +335,14 @@ e_util_menu_item_edje_icon_list_set(E_Menu_Item *mi, const char *list)
{
strncpy(buf, p, c - p);
buf[c - p] = 0;
if (e_util_menu_item_edje_icon_set(mi, buf)) return 1;
if (e_util_menu_item_theme_icon_set(mi, buf)) return 1;
p = c + 1;
if (!*p) return 0;
}
else
{
strcpy(buf, p);
if (e_util_menu_item_edje_icon_set(mi, buf)) return 1;
if (e_util_menu_item_theme_icon_set(mi, buf)) return 1;
return 0;
}
}
@ -380,6 +380,9 @@ e_util_edje_icon_set(Evas_Object *obj, const char *name)
return 0;
}
/* WARNING This function is deprecated, You should
* use e_util_menu_item_theme_icon_set() instead.
* It provide fallback (e theme <-> fdo theme) in both direction */
EAPI int
e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name)
{
@ -411,7 +414,7 @@ e_util_icon_size_normalize(unsigned int desired)
}
static int
_e_util_menu_item_fdo_icon_set_internal(E_Menu_Item *mi, const char *icon)
_e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon)
{
char *path = NULL;
unsigned int size;
@ -426,11 +429,11 @@ _e_util_menu_item_fdo_icon_set_internal(E_Menu_Item *mi, const char *icon)
}
EAPI int
e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon)
e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon)
{
if (e_config->icon_theme_overrides)
{
if (_e_util_menu_item_fdo_icon_set_internal(mi, icon))
if (_e_util_menu_item_fdo_icon_set(mi, icon))
return 1;
return e_util_menu_item_edje_icon_set(mi, icon);
}
@ -438,7 +441,7 @@ e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon)
{
if (e_util_menu_item_edje_icon_set(mi, icon))
return 1;
return _e_util_menu_item_fdo_icon_set_internal(mi, icon);
return _e_util_menu_item_fdo_icon_set(mi, icon);
}
}

2
src/bin/e_utils.h
Unescape View File

@ -34,7 +34,7 @@ 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 unsigned int e_util_icon_size_normalize(unsigned int desired);
EAPI int e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon);
EAPI int e_util_menu_item_theme_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);

2
src/modules/battery/e_mod_main.c
Unescape View File

@ -174,7 +174,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, NULL);
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);

2
src/modules/conf/e_mod_main.c
Unescape View File

@ -209,6 +209,6 @@ _e_mod_menu_add(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Settings Panel"));
e_util_menu_item_fdo_icon_set(mi, "preferences-system");
e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_callback_set(mi, _e_mod_conf_cb, NULL);
}

2
src/modules/conf_shelves/e_mod_main.c
Unescape View File

@ -82,6 +82,6 @@ _e_mod_menu_add(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Shelves"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf");
e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
}

2
src/modules/conf_theme/e_mod_main.c
Unescape View File

@ -82,6 +82,6 @@ _e_mod_menu_add(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Theme"));
e_util_menu_item_fdo_icon_set(mi, "preferences-desktop-theme");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
}

2
src/modules/conf_wallpaper/e_mod_main.c
Unescape View File

@ -94,6 +94,6 @@ _e_mod_menu_add(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Wallpaper"));
e_util_menu_item_fdo_icon_set(mi, "preferences-desktop-wallpaper");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper");
e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
}

2
src/modules/exebuf/e_mod_main.c
Unescape View File

@ -126,6 +126,6 @@ _e_mod_menu_add(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Run Command"));
e_util_menu_item_fdo_icon_set(mi, "system-run");
e_util_menu_item_theme_icon_set(mi, "system-run");
e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
}

16
src/modules/fileman/e_mod_main.c
Unescape View File

@ -297,7 +297,7 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, alias ? alias :
ecore_file_file_get(uri->path));
e_util_menu_item_fdo_icon_set(mi, "folder");
e_util_menu_item_theme_icon_set(mi, "folder");
e_menu_item_callback_set(mi, _e_mod_menu_gtk_cb,
strdup(uri->path));
}
@ -320,31 +320,31 @@ _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_fdo_icon_set(mi, "user-home");
e_util_menu_item_theme_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_fdo_icon_set(mi, "user-desktop");
e_util_menu_item_theme_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_fdo_icon_set(mi, "user-bookmarks");
e_util_menu_item_theme_icon_set(mi, "user-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_fdo_icon_set(mi, "user-trash");
//~ e_util_menu_item_theme_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_fdo_icon_set(mi, "computer");
e_util_menu_item_theme_icon_set(mi, "computer");
e_menu_item_callback_set(mi, _e_mod_menu_virtual_cb, "/");
Eina_Bool need_separator = 1;
@ -364,7 +364,7 @@ _e_mod_menu_generate(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, vol->label);
e_util_menu_item_fdo_icon_set(mi, vol->icon);
e_util_menu_item_theme_icon_set(mi, vol->icon);
e_menu_item_callback_set(mi, _e_mod_menu_volume_cb, vol);
volumes_visible = 1;
}
@ -387,7 +387,7 @@ _e_mod_menu_add(void *data, E_Menu *m)
#ifdef ENABLE_FILES
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Files"));
e_util_menu_item_fdo_icon_set(mi, "system-file-manager");
e_util_menu_item_theme_icon_set(mi, "system-file-manager");
sub = e_menu_new();
e_menu_item_submenu_set(mi, sub);
e_menu_pre_activate_callback_set(sub, _e_mod_menu_generate, NULL);

10
src/modules/gadman/e_mod_gadman.c
Unescape View File

@ -699,7 +699,7 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Appearance"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_menu_item_submenu_set(mi, mn);
e_object_del(E_OBJECT(mn));
@ -727,26 +727,26 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Behavior"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_menu_item_submenu_set(mi, mn);
e_object_del(E_OBJECT(mn));
/* Move / resize*/
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Begin move/resize this gadget"));
e_util_menu_item_edje_icon_set(mi, "widget/resize");
e_util_menu_item_theme_icon_set(mi, "widget/resize");
e_menu_item_callback_set(mi, on_menu_edit, gcc);
/* Remove this gadgets */
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Remove this gadget"));
e_util_menu_item_edje_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_menu_item_callback_set(mi, on_menu_delete, gcc);
/* Add other gadgets */
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Add other gadgets"));
e_util_menu_item_edje_icon_set(mi, "widget/add");
e_util_menu_item_theme_icon_set(mi, "widget/add");
e_menu_item_callback_set(mi, on_menu_add, gcc);
}

14
src/modules/ibar/e_mod_main.c
Unescape View File

@ -323,7 +323,7 @@ _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, b);
mi = e_menu_item_new(mn);
@ -800,12 +800,12 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
/* FIXME: other icon options go here too */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Change Icon Properties"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_properties, ic);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Remove Icon"));
e_util_menu_item_edje_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_remove, ic);
mi = e_menu_item_new(mn);
@ -815,14 +815,14 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Add An Icon"));
e_util_menu_item_edje_icon_set(mi, "widget/add");
e_util_menu_item_theme_icon_set(mi, "widget/add");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_add, NULL);
}
if (e_configure_registry_exists("applications/new_application"))
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Create New Icon"));
e_util_menu_item_edje_icon_set(mi, "widget/new");
e_util_menu_item_theme_icon_set(mi, "widget/new");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_new, NULL);
mi = e_menu_item_new(mn);
@ -831,14 +831,14 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, ic->ibar);
if (e_configure_registry_exists("applications/ibar_applications"))
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Add Application"));
e_util_menu_item_edje_icon_set(mi, "widget/add");
e_util_menu_item_theme_icon_set(mi, "widget/add");
e_menu_item_callback_set(mi, _ibar_cb_menu_add, ic->ibar);
}

4
src/modules/ibox/e_mod_main.c
Unescape View File

@ -316,7 +316,7 @@ _ibox_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _ibox_cb_menu_configuration, b);
mi = e_menu_item_new(mn);
@ -714,7 +714,7 @@ _ibox_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
/* FIXME: other icon options go here too */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _ibox_cb_menu_configuration, ic->ibox);
mi = e_menu_item_new(mn);

2
src/modules/mixer/e_mod_main.c
Unescape View File

@ -669,7 +669,7 @@ _mixer_menu_new(E_Mixer_Instance *inst, Evas_Event_Mouse_Down *ev)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _mixer_menu_cb_cfg, inst);
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);

4
src/modules/pager/e_mod_main.c
Unescape View File

@ -802,14 +802,14 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _pager_inst_cb_menu_configure, NULL);
if (e_configure_registry_exists("screen/virtual_desktops"))
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Virtual Desktops Settings"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops");
e_util_menu_item_theme_icon_set(mi, "enlightenment/desktops");
e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst);
}

2
src/modules/syscon/e_mod_main.c
Unescape View File

@ -120,6 +120,6 @@ _e_mod_menu_add(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("System"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/system");
e_util_menu_item_theme_icon_set(mi, "enlightenment/system");
e_menu_item_callback_set(mi, _e_mod_syscon_cb, NULL);
}

2
src/modules/temperature/e_mod_main.c
Unescape View File

@ -279,7 +279,7 @@ _temperature_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *eve
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_edje_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "widget/config");
e_menu_item_callback_set(mi, _temperature_face_cb_menu_configure, inst);
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);

Write Preview
Loading…
Cancel
Save