diff --git a/data/themes/default.edc b/data/themes/default.edc index 4f8aa4482..18fcb5438 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -16509,7 +16509,7 @@ collections { /* begin the collection of edje groups that are in this file */ part { name: "e.swallow.icon"; type: SWALLOW; description { - state: "default" 0.0; + state: "default" 0.0;color: 255 0 0 200; align: 0.0 0.5; fixed: 1 0; rel1 { @@ -22645,28 +22645,37 @@ group { name: "e/icons/"NAME ; \ #define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE) -// FreeDesktop.Org Icons (Note: in the comment the old e icon name) - +/* FreeDesktop.Org Icons (Note: in the comment the old e icon name) */ +//Standard Action Icons ICON("help-about","logo_black_128.png",64) // "enlightenment/about" -ICON("list-add","icon_add.png",64) -ICON("list-remove","icon_del.png",64) -ICON("preferences-desktop","icon_config.png",64) -ICON("preferences-desktop","icon_desktops.png",64) +ICON("list-add","icon_add.png",64) // "widget/add" +ICON("list-remove","icon_del.png",64) // "widget/del" +ICON("system-run","icon_run.png",64) // "enlightenment/run" + +//Standard Status Icons +ICON("dialog-warning","icon_warning.png",128) // "enlightenment/warning" + +//Standard Application Icons +ICON("preferences-desktop","icon_desktops.png",64) // "enlightenment/desktops" ICON("preferences-desktop-theme","icon_theme.png",64) // "enlightenment/themes" ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64) // "enlightenment/background" ICON("preferences-plugin","icon_modules.png",64) // "enlightenment/modules" ICON("preferences-system","icon_configuration.png",64) // "enlightenment/configuration" ICON("preferences-system-windows","icon_windows.png",64) // "enlightenment/windows" -ICON("system-file-manager","icon_efm_folder.png",64) -ICON("system-run","icon_run.png",64) // "enlightenment/run" +ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman" +//Standard Place Icons ICON("user-home","icon_efm_home.png",64) ICON("user-desktop","icon_efm_desktop.png",64) ICON("user-bookmarks","icon_favorites.png",64) -ICON("computer","icon_efm_root.png", 64) ICON("folder","icon_efm_folder.png",64) +//Standard Device Icons +ICON("computer","icon_efm_root.png", 64) + + + ICONMIME("inode/chardevice","icon_efm_file.png",128) ICONMIME("inode/blockdevice","icon_efm_file.png",128) @@ -22680,9 +22689,9 @@ ICONMIME("inode/socket","icon_efm_file.png",128) ICON("enlightenment/check","icon_check.png",64) ICON("widget/swap","icon_swap.png",64) -ICON("widget/del","icon_del.png",64) +//ICON("widget/del","icon_del.png",64) ICON("widget/new","icon_new.png",64) -ICON("widget/add","icon_add.png",64) +//ICON("widget/add","icon_add.png",64) ICON("widget/add_fav","icon_add_fav.png",64) ICON("widget/up_arrow","icon_up_arrow.png",64) ICON("widget/down_arrow","icon_down_arrow.png",64) @@ -22696,7 +22705,7 @@ ICON("widget/reset","icon_reset.png",64) /// Normal Icons /// -ICON("enlightenment/warning", "icon_warning.png",128) +//ICON("enlightenment/warning", "icon_warning.png",128) ICON("enlightenment/website","icon_globe.png",64) ICON("enlightenment/background","icon_wallpaper.png",64) //Done but some ref still around..... ICON("enlightenment/picture","icon_wallpaper.png",64) @@ -22720,7 +22729,7 @@ ICON("enlightenment/window_remembers","icon_window_remembers.png",64) ICON("enlightenment/focus","icon_window_focus.png",64) //ICON("enlightenment/modules","icon_modules.png",64) ICON("enlightenment/favorites","icon_favorites.png",64) -ICON("enlightenment/desktops","icon_desktops.png",64) +//ICON("enlightenment/desktops","icon_desktops.png",64) //ICON("enlightenment/configuration","icon_configuration.png",64) ICON("enlightenment/settings","icon_configuration.png",64) ICON("enlightenment/engine","icon_engine.png",64) @@ -22731,7 +22740,7 @@ ICON("enlightenment/imc","icon_imc.png",64) ICON("enlightenment/system","icon_system.png",64) //ICON("enlightenment/run","icon_run.png",64) ICON("enlightenment/directories","icon_directories.png",64) -ICON("enlightenment/fileman","icon_efm_folder.png",64) +//ICON("enlightenment/fileman","icon_efm_folder.png",64) ICON("enlightenment/unknown","icon_dummy.png",64) ICON("enlightenment/mouse","icon_mouse.png",64) ICON("enlightenment/mouse_left","icon_mouse_left.png",64) diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c index df96e4e42..e8701e142 100644 --- a/src/bin/e_dialog.c +++ b/src/bin/e_dialog.c @@ -157,9 +157,9 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size) if (!icon) return; dia->icon_object = edje_object_add(e_win_evas_get(dia->win)); - dia->icon_object = e_icon_add(e_win_evas_get(dia->win)); - e_util_icon_theme_set(dia->icon_object, icon); - //edje_extern_object_min_size_set(dia->icon_object, size, size); + //dia->icon_object = e_icon_add(e_win_evas_get(dia->win)); + e_util_edje_icon_set(dia->icon_object, icon); + edje_extern_object_min_size_set(dia->icon_object, size, size); edje_object_part_swallow(dia->bg_object, "e.swallow.icon", dia->icon_object); evas_object_show(dia->icon_object); } diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 4bac10841..ff02e99b3 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -1297,7 +1297,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, _("Remove this gadget")); - e_util_menu_item_theme_icon_set(mi, "widget/del"); + e_util_menu_item_theme_icon_set(mi, "list-remove"); e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc); } if (gcc->gadcon->menu_attach.func) diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index 16d8878c4..e15e1b7af 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -40,7 +40,7 @@ const CFTypes _types[] = { {"appearance", N_("Appearance"), "enlightenment/appearance"}, {"config", N_("Settings"), "preferences-system"}, - {"fileman", N_("File Manager"), "enlightenment/fileman"}, + {"fileman", N_("File Manager"), "system-file-manager"}, {"shelf", N_("Shelf"), "enlightenment/shelf"}, {"system", N_("System"), "enlightenment/system"}, {NULL, NULL, NULL} @@ -185,7 +185,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_on_change_hook_set(ol, _avail_list_cb_change, cfdata); _fill_list(ol, 0); e_widget_frametable_object_append(of, ol, 0, 0, 1, 1, 1, 1, 1, 1); - ol = e_widget_button_add(evas, _("Load Module"), "widget/add", + ol = e_widget_button_add(evas, _("Load Module"), "list-add", _btn_cb_load, cfdata, NULL); cfdata->b_load = ol; e_widget_disabled_set(ol, 1); @@ -199,7 +199,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_on_change_hook_set(ol, _load_list_cb_change, cfdata); _fill_list(ol, 1); e_widget_frametable_object_append(of, ol, 0, 0, 1, 1, 1, 1, 1, 1); - ol = e_widget_button_add(evas, _("Unload Module"), "widget/del", + ol = e_widget_button_add(evas, _("Unload Module"), "list-remove", _btn_cb_unload, cfdata, NULL); cfdata->b_unload = ol; e_widget_disabled_set(ol, 1); diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 1b9cd8ab2..99df7ee11 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -254,7 +254,7 @@ 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_theme_icon_set(mi, "enlightenment/desktops"); + e_util_menu_item_theme_icon_set(mi, "preferences-desktop"); e_menu_pre_activate_callback_set(subm, _e_int_menus_virtuals_pre_cb, NULL); e_menu_item_submenu_set(mi, subm); @@ -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_theme_icon_set(mi, "enlightenment/desktops"); + e_util_menu_item_theme_icon_set(mi, "preferences-desktop"); subm = e_menu_new(); } else diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index f69ed7937..9f229aebe 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -1635,6 +1635,6 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m) mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Delete this Shelf")); - e_util_menu_item_theme_icon_set(mi, "widget/del"); + e_util_menu_item_theme_icon_set(mi, "list-remove"); e_menu_item_callback_set(mi, _e_shelf_cb_menu_delete, es); } diff --git a/src/bin/e_widget_config_list.c b/src/bin/e_widget_config_list.c index d4973db2b..663f3616b 100644 --- a/src/bin/e_widget_config_list.c +++ b/src/bin/e_widget_config_list.c @@ -60,13 +60,13 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, e_widget_min_size_set(o, 100, 25); e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 0, 1, 0); - o = e_widget_button_add(evas, _("Add"), "widget/add", _button_cb_add, + o = e_widget_button_add(evas, _("Add"), "list-add", _button_cb_add, wd, obj); wd->gui.add = o; e_widget_disabled_set(o, 1); e_widget_table_object_append(wd->gui.table, o, 0, 3, 1, 1, 1, 0, 1, 0); - o = e_widget_button_add(evas, _("Remove"), "widget/del", + o = e_widget_button_add(evas, _("Remove"), "list-remove", _button_cb_remove, wd, obj); wd->gui.remove = o; e_widget_disabled_set(o, 1); diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index f982ad3a4..22320721e 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -244,7 +244,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) cfdata->o_all = ow; _fill_apps(cfdata); e_widget_frametable_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 1, 1); - ow = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, + ow = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL); cfdata->o_add = ow; e_widget_disabled_set(ow, 1); @@ -270,7 +270,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_disabled_set(ow, 1); e_widget_table_object_append(bt, ow, 1, 0, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(ot, bt, 0, 1, 1, 1, 1, 0, 1, 0); - ow = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del, + ow = e_widget_button_add(evas, _("Delete"), "list-remove", _cb_del, cfdata, NULL); cfdata->o_del = ow; e_widget_disabled_set(ow, 1); diff --git a/src/modules/conf_desk/e_int_config_desk.c b/src/modules/conf_desk/e_int_config_desk.c index 7713daf9e..cb3549339 100644 --- a/src/modules/conf_desk/e_int_config_desk.c +++ b/src/modules/conf_desk/e_int_config_desk.c @@ -50,7 +50,7 @@ e_int_config_desk(E_Container *con, const char *params) v->override_auto_apply = 1; cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "_config_desk_dialog", - "enlightenment/desktops", 0, v, cfdata); + "preferences-desktop", 0, v, cfdata); return cfd; } diff --git a/src/modules/conf_desks/e_int_config_desks.c b/src/modules/conf_desks/e_int_config_desks.c index 1a59193ef..9442f2894 100644 --- a/src/modules/conf_desks/e_int_config_desks.c +++ b/src/modules/conf_desks/e_int_config_desks.c @@ -53,7 +53,7 @@ e_int_config_desks(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Virtual Desktops Settings"), "E", "_config_desks_dialog", - "enlightenment/desktops", 0, v, NULL); + "preferences-desktop", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_desks/e_mod_main.c b/src/modules/conf_desks/e_mod_main.c index 2387c1eb0..753c47357 100644 --- a/src/modules/conf_desks/e_mod_main.c +++ b/src/modules/conf_desks/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/virtual_desktops", 10, _("Virtual Desktops"), NULL, "enlightenment/desktops", e_int_config_desks); + e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "preferences-desktop", e_int_config_desks); conf_module = m; e_module_delayed_set(m, 1); return m; diff --git a/src/modules/conf_mime/e_mod_main.c b/src/modules/conf_mime/e_mod_main.c index 91e49b5a5..f2c0aa6eb 100644 --- a/src/modules/conf_mime/e_mod_main.c +++ b/src/modules/conf_mime/e_mod_main.c @@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi = EAPI void * e_modapi_init(E_Module *m) { - e_configure_registry_category_add("fileman", 100, _("Files"), NULL, "enlightenment/fileman"); + e_configure_registry_category_add("fileman", 100, _("Files"), NULL, "system-file-manager"); e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), NULL, "enlightenment/file_icons", e_int_config_mime); conf_module = m; e_module_delayed_set(m, 1); diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c index adc2f2d01..bb682715e 100644 --- a/src/modules/conf_profiles/e_int_config_profiles.c +++ b/src/modules/conf_profiles/e_int_config_profiles.c @@ -119,9 +119,9 @@ _create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) cfdata->o_text = ob; ot = e_widget_table_add(evas, 0); - ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata, NULL); + ob = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL); e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 0, 0); - cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_delete, cfdata, NULL); + 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); e_widget_table_object_align_append(ot, cfdata->o_reset, 2, 0, 1, 1, 0, 1, 1, 1, 1.0, 0.5); @@ -287,7 +287,7 @@ _cb_delete(void *data, void *data2) d->cfdata->sel_profile); e_confirm_dialog_show (_("Delete OK?"), - "enlightenment/warning", buf, NULL, NULL, _cb_dialog_yes, NULL, d, NULL, + "dialog-warning", buf, NULL, NULL, _cb_dialog_yes, NULL, d, NULL, _cb_dialog_destroy, d); } diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index 5f1a2a8cb..ea7da62bd 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -76,9 +76,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_list_object_append(o, of, 1, 1, 0.5); ot = e_widget_table_add(evas, 0); - ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata, NULL); + ob = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL); e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 0, 0); - cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "widget/del", + cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "list-remove", _cb_delete, cfdata, NULL); e_widget_table_object_append(ot, cfdata->o_delete, 0, 1, 1, 1, 1, 1, 0, 0); cfdata->o_config = e_widget_button_add(evas, _("Configure"), "widget/config", diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c index e2fffab72..cca738b68 100644 --- a/src/modules/conf_window_remembers/e_int_config_remembers.c +++ b/src/modules/conf_window_remembers/e_int_config_remembers.c @@ -92,7 +92,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) o = e_widget_list_add(evas, 0, 0); of = e_widget_frametable_add(evas, _("Window Remembers"), 0); - ow = e_widget_button_add(evas, _("Delete Remember(s)"), "widget/del", + ow = e_widget_button_add(evas, _("Delete Remember(s)"), "list-remove", _cb_delete, cfdata, NULL); cfdata->btn = ow; diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 8477df890..85cb2f045 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -421,7 +421,7 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path) if (fwin->win->border->internal_icon) eina_stringshare_del(fwin->win->border->internal_icon); fwin->win->border->internal_icon = - eina_stringshare_add("enlightenment/fileman"); + eina_stringshare_add("system-file-manager"); } return fwin; diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c index 3742323c9..b3f2338fb 100644 --- a/src/modules/fileman/e_mod_config.c +++ b/src/modules/fileman/e_mod_config.c @@ -87,7 +87,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__) v->basic.create_widgets = _basic_create; cfd = e_config_dialog_new(con, _("Fileman Settings"), "E", "_config_fileman_dialog", - "enlightenment/fileman", 0, v, NULL); + "system-file-manager", 0, v, NULL); return cfd; } diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index 6d3f25847..552bbcf8f 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -47,9 +47,9 @@ e_modapi_init(E_Module *m) /* Setup Entry in Config Panel */ e_configure_registry_category_add("fileman", 100, _("Files"), - NULL, "enlightenment/fileman"); + NULL, "system-file-manager"); e_configure_registry_item_add("fileman/fileman", 10, _("File Manager"), - NULL, "enlightenment/fileman", + NULL, "system-file-manager", e_int_config_fileman); /* Setup Config edd */ diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index d049cf503..e7799a209 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -740,13 +740,13 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu) /* Remove this gadgets */ mi = e_menu_item_new(menu); e_menu_item_label_set(mi, _("Remove this gadget")); - e_util_menu_item_theme_icon_set(mi, "widget/del"); + e_util_menu_item_theme_icon_set(mi, "list-remove"); 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_theme_icon_set(mi, "widget/add"); + e_util_menu_item_theme_icon_set(mi, "list-add"); e_menu_item_callback_set(mi, on_menu_add, gcc); } diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index 3a06cb619..746c3def8 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -106,9 +106,9 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_frametable_object_append(of, ol, 0, 0, 1, 2, 1, 1, 1, 0); ot = e_widget_table_add(evas, 0); - ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata, NULL); + ob = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL); e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 1, 0); - ob = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del, cfdata, NULL); + ob = e_widget_button_add(evas, _("Delete"), "list-remove", _cb_del, cfdata, NULL); e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 1, 1, 0); ob = e_widget_button_add(evas, _("Configure"), "widget/config", _cb_config, cfdata, NULL); e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 1, 1, 0); diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 2282f2e28..b0ba59938 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -805,7 +805,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, _("Remove Icon")); - e_util_menu_item_theme_icon_set(mi, "widget/del"); + e_util_menu_item_theme_icon_set(mi, "list-remove"); e_menu_item_callback_set(mi, _ibar_cb_menu_icon_remove, ic); mi = e_menu_item_new(mn); @@ -815,7 +815,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, _("Add An Icon")); - e_util_menu_item_theme_icon_set(mi, "widget/add"); + e_util_menu_item_theme_icon_set(mi, "list-add"); e_menu_item_callback_set(mi, _ibar_cb_menu_icon_add, NULL); } if (e_configure_registry_exists("applications/new_application")) @@ -838,7 +838,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, _("Add Application")); - e_util_menu_item_theme_icon_set(mi, "widget/add"); + e_util_menu_item_theme_icon_set(mi, "list-add"); e_menu_item_callback_set(mi, _ibar_cb_menu_add, ic->ibar); } diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 94dd92708..c6abd9617 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -809,7 +809,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, _("Virtual Desktops Settings")); - e_util_menu_item_theme_icon_set(mi, "enlightenment/desktops"); + e_util_menu_item_theme_icon_set(mi, "preferences-desktop"); e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst); }