diff options
Diffstat (limited to 'src/modules')
19 files changed, 36 insertions, 36 deletions
diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index 22320721e2..ddbf9d445c 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -50,7 +50,7 @@ e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__) data = E_NEW(E_Config_Data, 1); data->title = eina_stringshare_add(_("Favorites Menu")); data->dialog = eina_stringshare_add("_config_apps_favs_dialog"); - data->icon = eina_stringshare_add("enlightenment/favorites"); + data->icon = eina_stringshare_add("user-bookmarks"); data->filename = eina_stringshare_add(buf); return _create_dialog(con, data); @@ -259,12 +259,12 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _fill_list(cfdata); e_widget_frametable_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 1, 1); bt = e_widget_table_add(evas, 0); - ow = e_widget_button_add(evas, _("Up"), "widget/up_arrow", _cb_up, + ow = e_widget_button_add(evas, _("Up"), "go-up", _cb_up, cfdata, NULL); cfdata->o_up = ow; e_widget_disabled_set(ow, 1); e_widget_table_object_append(bt, ow, 0, 0, 1, 1, 1, 0, 1, 0); - ow = e_widget_button_add(evas, _("Down"), "widget/down_arrow", _cb_down, + ow = e_widget_button_add(evas, _("Down"), "go-down", _cb_down, cfdata, NULL); cfdata->o_down = ow; e_widget_disabled_set(ow, 1); diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c index 502ae20ec1..78394e8aa6 100644 --- a/src/modules/conf_applications/e_mod_main.c +++ b/src/modules/conf_applications/e_mod_main.c @@ -39,7 +39,7 @@ e_modapi_init(E_Module *m) e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal"); e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "preferences-system-windows", e_int_config_apps_ibar_other); e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus"); - e_configure_registry_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "enlightenment/favorites", e_int_config_apps_favs); + e_configure_registry_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "user-bookmarks", e_int_config_apps_favs); conf_module = m; e_module_delayed_set(m, 1); return m; diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c index fe9743d50d..9ddf40f058 100644 --- a/src/modules/conf_colors/e_int_config_color_classes.c +++ b/src/modules/conf_colors/e_int_config_color_classes.c @@ -587,8 +587,8 @@ _load_color_classes(Evas_Object *obj, E_Config_Dialog_Data *cfdata) { if (cfc->enabled) { - icon = edje_object_add(evas_object_evas_get(obj)); - e_util_edje_icon_set(icon, "enlightenment/check"); + icon = e_icon_add(evas_object_evas_get(obj)); + e_util_icon_theme_set(icon, "dialog-ok-apply"); } else icon = NULL; @@ -628,8 +628,8 @@ _radio_cb_change(void *data, Evas_Object *obj, void *event_info) c->enabled = cfdata->state; if (c->enabled) { - icon = edje_object_add(evas_object_evas_get(cfdata->gui.ilist)); - e_util_edje_icon_set(icon, "enlightenment/check"); + icon = e_icon_add(evas_object_evas_get(cfdata->gui.ilist)); + e_util_icon_theme_set(icon, "dialog-ok-apply"); } else icon = NULL; diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c index a736a1532b..0ea5d4684b 100644 --- a/src/modules/conf_desklock/e_int_config_desklock.c +++ b/src/modules/conf_desklock/e_int_config_desklock.c @@ -204,7 +204,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_table_object_append(rt, ow, 1, 0, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(ft, rt, 0, 0, 1, 1, 0, 0, 0, 0); cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"), - "widget/up_dir", _cb_button_up, + "go-up", _cb_button_up, cfdata, NULL); e_widget_table_object_append(ft, cfdata->o_btn, 0, 1, 1, 1, 0, 0, 0, 0); diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c index 267dc52474..26bb9baa1a 100644 --- a/src/modules/conf_display/e_int_config_display.c +++ b/src/modules/conf_display/e_int_config_display.c @@ -548,8 +548,8 @@ _load_resolutions(E_Config_Dialog_Data *cfdata) if ((res->size.width == cfdata->orig_size.width) && (res->size.height == cfdata->orig_size.height)) { - ob = edje_object_add(evas); - e_util_edje_icon_set(ob, "enlightenment/check"); + ob = e_icon_add(evas); + e_util_icon_theme_set(ob, "dialog-ok-apply"); sel = res->id; } e_widget_ilist_append(cfdata->res_list, ob, buf, @@ -572,8 +572,8 @@ _load_resolutions(E_Config_Dialog_Data *cfdata) if ((res->size.width == cfdata->orig_size.width) && (res->size.height == cfdata->orig_size.height)) { - ob = edje_object_add(evas); - e_util_edje_icon_set(ob, "enlightenment/check"); + ob = e_icon_add(evas); + e_util_icon_theme_set(ob, "dialog-ok-apply"); sel = res->id; } e_widget_ilist_nth_icon_set(cfdata->res_list, res->id, ob); @@ -612,8 +612,8 @@ _load_rates(E_Config_Dialog_Data *cfdata) if (rt->rate == cfdata->orig_rate.rate) { - ob = edje_object_add(evas); - e_util_edje_icon_set(ob, "enlightenment/check"); + ob = e_icon_add(evas); + e_util_icon_theme_set(ob, "dialog-ok-apply"); sel = k; } e_widget_ilist_append(cfdata->rate_list, ob, buf, NULL, NULL, NULL); diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c index f145fefd37..03164d07f0 100644 --- a/src/modules/conf_fonts/e_int_config_fonts.c +++ b/src/modules/conf_fonts/e_int_config_fonts.c @@ -735,8 +735,8 @@ _class_list_load(E_Config_Dialog_Data *cfdata) { if (tc->enabled) { - ic = edje_object_add(evas); - e_util_edje_icon_set(ic, "enlightenment/check"); + ic = e_icon_add(evas); + e_util_icon_theme_set(ic, "dialog-ok-apply"); } else ic = NULL; diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c index edcb70955a..0ee60d227f 100644 --- a/src/modules/conf_imc/e_int_config_imc.c +++ b/src/modules/conf_imc/e_int_config_imc.c @@ -831,7 +831,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0); - o = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", _cb_button_up, cfdata, NULL); + o = e_widget_button_add(evas, _("Go up a Directory"), "go-up", _cb_button_up, cfdata, NULL); cfdata->o_up_button = o; e_widget_table_object_append(ol, o, 0, 1, 1, 1, 0, 0, 0, 0); @@ -898,7 +898,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data ol = e_widget_list_add(evas, 1, 1); - o = e_widget_button_add(evas, _("New"), "widget/new", _cb_new, cfdata, NULL); + o = e_widget_button_add(evas, _("New"), "document-new", _cb_new, cfdata, NULL); e_widget_list_object_append(ol, o, 1, 0, 0.5); o = e_widget_button_add(evas, _("Import..."), "enlightenment/imc", _cb_import, cfdata, NULL); e_widget_list_object_append(ol, o, 1, 0, 0.5); diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c index a3b3ded036..e4d9e4ac23 100644 --- a/src/modules/conf_intl/e_int_config_intl.c +++ b/src/modules/conf_intl/e_int_config_intl.c @@ -1362,8 +1362,8 @@ _lang_list_load(void *data) { Evas_Object *ic; - ic = edje_object_add(cfdata->evas); - e_util_edje_icon_set(ic, "enlightenment/check"); + ic = e_icon_add(cfdata->evas); + e_util_icon_theme_set(ic, "dialog-ok-apply"); e_widget_ilist_append(cfdata->gui.lang_list, ic, trans, NULL, NULL, ln->lang_code); } else diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c index bb682715ef..4fcfd39fe8 100644 --- a/src/modules/conf_profiles/e_int_config_profiles.c +++ b/src/modules/conf_profiles/e_int_config_profiles.c @@ -123,7 +123,7 @@ _create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 0, 0); cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "list-remove", _cb_delete, cfdata, NULL); e_widget_table_object_append(ot, cfdata->o_delete, 1, 0, 1, 1, 1, 1, 0, 0); - cfdata->o_reset = e_widget_button_add(evas, _("Reset"), "widget/reset", _cb_reset, cfdata, NULL); + cfdata->o_reset = e_widget_button_add(evas, _("Reset"), "system-restart", _cb_reset, cfdata, NULL); e_widget_table_object_align_append(ot, cfdata->o_reset, 2, 0, 1, 1, 0, 1, 1, 1, 1.0, 0.5); // if there is a system version of the profile - allow reset diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c index 067d447019..e4e38f8c0b 100644 --- a/src/modules/conf_screensaver/e_int_config_screensaver.c +++ b/src/modules/conf_screensaver/e_int_config_screensaver.c @@ -48,7 +48,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con,_("Screen Saver Settings"), "E", "_config_screensaver_dialog", - "enlightenment/screensaver", 0, v, NULL); + "preferences-desktop-screensaver", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_screensaver/e_mod_main.c b/src/modules/conf_screensaver/e_mod_main.c index 7535ca6fae..f19ec97115 100644 --- a/src/modules/conf_screensaver/e_mod_main.c +++ b/src/modules/conf_screensaver/e_mod_main.c @@ -32,7 +32,7 @@ EAPI void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup"); - e_configure_registry_item_add("screen/screen_saver", 40, _("Screen Saver"), NULL, "enlightenment/screensaver", e_int_config_screensaver); + e_configure_registry_item_add("screen/screen_saver", 40, _("Screen Saver"), NULL, "preferences-desktop-screensaver", e_int_config_screensaver); conf_module = m; e_module_delayed_set(m, 1); return m; diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index ea7da62bdb..3a9dee384b 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -279,7 +279,7 @@ _cb_delete(void *data, void *data2) d->cfdata->cur_shelf); e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), - "enlightenment/exit", buf, NULL, NULL, + "application-exit", buf, NULL, NULL, _cb_dialog_yes, NULL, d, NULL, _cb_dialog_destroy, d); } diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c index d1b089ae9c..1a45630e45 100644 --- a/src/modules/conf_startup/e_int_config_startup.c +++ b/src/modules/conf_startup/e_int_config_startup.c @@ -278,7 +278,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0); - o = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", + o = e_widget_button_add(evas, _("Go up a Directory"), "go-up", _cb_button_up, cfdata, NULL); cfdata->o_up_button = o; e_widget_table_object_append(ol, o, 0, 1, 1, 1, 0, 0, 0, 0); diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index 75ff3afb7d..447d8db2db 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -364,7 +364,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0); - o = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", + o = e_widget_button_add(evas, _("Go up a Directory"), "go-up", _cb_button_up, cfdata, NULL); cfdata->o_up_button = o; e_widget_table_object_append(ol, o, 0, 1, 1, 1, 0, 0, 0, 0); @@ -827,8 +827,8 @@ _fill_categories_ilist(E_Config_Dialog_Data *cfdata) theme = themes->data; if (theme->file) { - ic = edje_object_add(evas); - e_util_edje_icon_set(ic, "enlightenment/check"); + ic = e_icon_add(evas); + e_util_icon_theme_set(ic, "dialog-ok-apply"); } e_widget_ilist_append(o, ic, theme->category + 11, NULL, NULL, NULL); themes = themes->next; diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c index f838673ac9..12aeea485b 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c @@ -514,7 +514,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_table_object_append(rt, ow, 1, 0, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(ot, rt, 0, 0, 1, 1, 0, 0, 0, 0); - ow = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", + ow = e_widget_button_add(evas, _("Go up a Directory"), "go-up", _cb_button_up, cfdata, NULL); cfdata->o_up_button = ow; e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 0, 0, 0, 0); @@ -644,7 +644,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_table_object_append(rt, ow, 1, 0, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(ot, rt, 0, 0, 1, 1, 0, 0, 0, 0); - ow = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", + ow = e_widget_button_add(evas, _("Go up a Directory"), "go-up", _cb_button_up, cfdata, NULL); cfdata->o_up_button = ow; e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 0, 0, 0, 0); diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 85cb2f0453..bf37f7301c 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1396,9 +1396,9 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always) e_dialog_title_set(dia, _("Open with...")); e_dialog_resizable_set(dia, 1); - e_dialog_button_add(dia, _("Open"), "widget/open", + e_dialog_button_add(dia, _("Open"), "document-open", _e_fwin_cb_open, fad); - e_dialog_button_add(dia, _("Close"), "widget/close", + e_dialog_button_add(dia, _("Close"), "window-close", _e_fwin_cb_close, fad); fad->dia = dia; diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index e7799a2095..4c1059a7f0 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -734,7 +734,7 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu) /* Move / resize*/ mi = e_menu_item_new(menu); e_menu_item_label_set(mi, _("Begin move/resize this gadget")); - e_util_menu_item_theme_icon_set(mi, "widget/resize"); + e_util_menu_item_theme_icon_set(mi, "transform-scale"); e_menu_item_callback_set(mi, on_menu_edit, gcc); /* Remove this gadgets */ diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index 746c3def8a..878941864d 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -185,7 +185,7 @@ _cb_del(void *data, void *data2) cfdata->dir); dialog = e_confirm_dialog_show(_("Are you sure you want to delete this bar source?"), - "enlightenment/exit", buf, NULL, NULL, + "application-exit", buf, NULL, NULL, _cb_confirm_dialog_yes, NULL, cfdata, NULL, _cb_confirm_dialog_destroy, cfdata); cfdata->dialog_delete = dialog; } diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index b0ba599386..259e14d5d9 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -822,7 +822,7 @@ _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, _("Create New Icon")); - e_util_menu_item_theme_icon_set(mi, "widget/new"); + e_util_menu_item_theme_icon_set(mi, "document-new"); e_menu_item_callback_set(mi, _ibar_cb_menu_icon_new, NULL); mi = e_menu_item_new(mn); |