diff --git a/config/illume/e.src b/config/illume/e.src index 91f2fc6af..b02e1338c 100644 --- a/config/illume/e.src +++ b/config/illume/e.src @@ -796,7 +796,7 @@ group "E_Config" struct { value "action" string: "suspend"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/suspend"; + value "icon" string: "system-suspend"; value "is_main" int: 1; } } @@ -804,7 +804,7 @@ group "E_Config" struct { group "E_Config_Syscon_Action" struct { value "action" string: "desk_lock"; value "button" string: "button"; - value "icon" string: "enlightenment/desklock_menu"; + value "icon" string: "system-lock-screen"; value "is_main" int: 1; } } @@ -813,7 +813,7 @@ group "E_Config" struct { value "action" string: "halt"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/halt"; + value "icon" string: "system-shutdown"; value "is_main" int: 0; } } diff --git a/config/minimalist/e.src b/config/minimalist/e.src index 96ccec10a..4331f6c44 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -2001,7 +2001,7 @@ group "E_Config" struct { value "action" string: "halt"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/halt"; + value "icon" string: "system-shutdown"; value "is_main" int: 1; } } @@ -2010,7 +2010,7 @@ group "E_Config" struct { value "action" string: "suspend"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/suspend"; + value "icon" string: "system-suspend"; value "is_main" int: 1; } } @@ -2018,7 +2018,7 @@ group "E_Config" struct { group "E_Config_Syscon_Action" struct { value "action" string: "desk_lock"; value "button" string: "button"; - value "icon" string: "enlightenment/desklock_menu"; + value "icon" string: "system-lock-screen"; value "is_main" int: 1; } } @@ -2027,7 +2027,7 @@ group "E_Config" struct { value "action" string: "reboot"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/reboot"; + value "icon" string: "system-restart"; value "is_main" int: 0; } } @@ -2036,7 +2036,7 @@ group "E_Config" struct { value "action" string: "hibernate"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/hibernate"; + value "icon" string: "system-suspend-hibernate"; value "is_main" int: 0; } } @@ -2045,7 +2045,7 @@ group "E_Config" struct { value "action" string: "logout"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/logout"; + value "icon" string: "system-log-out"; value "is_main" int: 0; } } diff --git a/config/netbook/e.src b/config/netbook/e.src index 708e631d1..e0a0daecc 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -2065,7 +2065,7 @@ group "E_Config" struct { value "action" string: "halt"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/halt"; + value "icon" string: "system-shutdown"; value "is_main" int: 1; } } @@ -2074,7 +2074,7 @@ group "E_Config" struct { value "action" string: "suspend"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/suspend"; + value "icon" string: "system-suspend"; value "is_main" int: 1; } } @@ -2082,7 +2082,7 @@ group "E_Config" struct { group "E_Config_Syscon_Action" struct { value "action" string: "desk_lock"; value "button" string: "button"; - value "icon" string: "enlightenment/desklock_menu"; + value "icon" string: "system-lock-screen"; value "is_main" int: 1; } } @@ -2091,7 +2091,7 @@ group "E_Config" struct { value "action" string: "reboot"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/reboot"; + value "icon" string: "system-restart"; value "is_main" int: 0; } } @@ -2100,7 +2100,7 @@ group "E_Config" struct { value "action" string: "hibernate"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/hibernate"; + value "icon" string: "system-suspend-hibernate"; value "is_main" int: 0; } } @@ -2109,7 +2109,7 @@ group "E_Config" struct { value "action" string: "logout"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/logout"; + value "icon" string: "system-log-out"; value "is_main" int: 0; } } diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 0ea66201e..0a6b008ef 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -2088,7 +2088,7 @@ group "E_Config" struct { value "action" string: "halt"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/halt"; + value "icon" string: "system-shutdown"; value "is_main" int: 1; } } @@ -2097,7 +2097,7 @@ group "E_Config" struct { value "action" string: "suspend"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/suspend"; + value "icon" string: "system-suspend"; value "is_main" int: 1; } } @@ -2105,7 +2105,7 @@ group "E_Config" struct { group "E_Config_Syscon_Action" struct { value "action" string: "desk_lock"; value "button" string: "button"; - value "icon" string: "enlightenment/desklock_menu"; + value "icon" string: "system-lock-screen"; value "is_main" int: 1; } } @@ -2114,7 +2114,7 @@ group "E_Config" struct { value "action" string: "reboot"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/reboot"; + value "icon" string: "system-restart"; value "is_main" int: 0; } } @@ -2123,7 +2123,7 @@ group "E_Config" struct { value "action" string: "hibernate"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/hibernate"; + value "icon" string: "system-suspend-hibernate"; value "is_main" int: 0; } } @@ -2132,7 +2132,7 @@ group "E_Config" struct { value "action" string: "logout"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/logout"; + value "icon" string: "system-log-out"; value "is_main" int: 0; } } diff --git a/config/standard/e.src b/config/standard/e.src index 66de65bc7..2aca4fc96 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -2098,7 +2098,7 @@ group "E_Config" struct { value "action" string: "halt"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/halt"; + value "icon" string: "system-shutdown"; value "is_main" int: 1; } } @@ -2107,7 +2107,7 @@ group "E_Config" struct { value "action" string: "suspend"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/suspend"; + value "icon" string: "system-suspend"; value "is_main" int: 1; } } @@ -2115,7 +2115,7 @@ group "E_Config" struct { group "E_Config_Syscon_Action" struct { value "action" string: "desk_lock"; value "button" string: "button"; - value "icon" string: "enlightenment/desklock_menu"; + value "icon" string: "system-lock-screen"; value "is_main" int: 1; } } @@ -2124,7 +2124,7 @@ group "E_Config" struct { value "action" string: "reboot"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/reboot"; + value "icon" string: "system-restart"; value "is_main" int: 0; } } @@ -2133,7 +2133,7 @@ group "E_Config" struct { value "action" string: "hibernate"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/hibernate"; + value "icon" string: "system-suspend-hibernate"; value "is_main" int: 0; } } @@ -2142,7 +2142,7 @@ group "E_Config" struct { value "action" string: "logout"; value "params" string: "now"; value "button" string: "button"; - value "icon" string: "enlightenment/logout"; + value "icon" string: "system-log-out"; value "is_main" int: 0; } } diff --git a/data/themes/default.edc b/data/themes/default.edc index 8b6736807..33c705281 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -22651,15 +22651,34 @@ group { name: "e/icons/"NAME ; \ ICON("help-about","logo_black_128.png",64) // "enlightenment/about" ICON("list-add","icon_add.png",64) // "widget/add" ICON("list-remove","icon_del.png",64) // "widget/del" +ICON("go-up","icon_up_arrow.png",64) // "widget/up_arrow" "widget/up_dir" +ICON("go-down","icon_down_arrow.png",64) // "widget/down_arrow" +ICON("go-next","icon_right_arrow.png",64) // "widget/new_dialog" +ICON("go-previous","icon_left_arrow.png",64) // none ICON("system-run","icon_run.png",64) // "enlightenment/run" +ICON("system-shutdown","icon_halt.png",128) // "enlightenment/halt" +ICON("system-restart","icon_reboot.png",128) // "enlightenment/reboot" +ICON("system-suspend","icon_suspend.png",128) // "enlightenment/suspend" +ICON("system-suspend-hibernate","icon_hibernate.png",128) // "enlightenment/hibernate" +ICON("system-log-out","icon_logout.png",128) // "enlightenment/logout" +ICON("system-restart","icon_reset.png",128) // "enlightenment/reset" "widget/reset" +ICON("system-lock-screen","icon_desklock_menu.png",128) // "enlightenment/desklock_menu" +ICON("window-close","icon_close.png",64) // "widget/close" +ICON("document-open","icon_check.png",64) // "widget/open" +ICON("document-new","icon_new.png",64) // "widget/new" +ICON("dialog-ok-apply","icon_check.png",64) // "enlightenment/check" +ICON("transform-scale","icon_resize.png",64) // "widget/resize" +ICON("transform-move","icon_autoscroll.png",64) // "enlightenment/autoscroll" //Standard Status Icons ICON("dialog-warning","icon_warning.png",128) // "enlightenment/warning" //Standard Application Icons +ICON("application-exit","icon_logout.png",64) // "enlightenment/exit" 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-desktop-screensaver","icon_screensaver.png",64)// "enlightenment/screensaver" 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" @@ -22668,13 +22687,16 @@ ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenmen //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("user-bookmarks","icon_favorites.png",64) // "enlightenment/favorites" ICON("folder","icon_efm_folder.png",64) //Standard Device Icons -ICON("computer","icon_efm_root.png", 64) - +ICON("computer","icon_efm_root.png", 64) // "fileman/root" +ICON("drive-harddisk","icon_efm_hdd.png", 128) // "fileman/hd" +ICON("drive-optical","icon_efm_cd.png", 128) // "fileman/??" +ICON("media-flash","icon_efm_flash.png", 128) // "fileman/??" +/* End of FreeDesktop.Org icons */ ICONMIME("inode/chardevice","icon_efm_file.png",128) @@ -22687,21 +22709,21 @@ ICONMIME("inode/socket","icon_efm_file.png",128) // Widget Icons // -ICON("enlightenment/check","icon_check.png",64) +//ICON("enlightenment/check","icon_check.png",64) ICON("widget/swap","icon_swap.png",64) //ICON("widget/del","icon_del.png",64) -ICON("widget/new","icon_new.png",64) +//ICON("widget/new","icon_new.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) -ICON("widget/up_dir","icon_up_arrow.png",64) -ICON("widget/new_dialog","icon_right_arrow.png",64) +//ICON("widget/up_arrow","icon_up_arrow.png",64) +//ICON("widget/down_arrow","icon_down_arrow.png",64) +//ICON("widget/up_dir","icon_up_arrow.png",64) +//ICON("widget/new_dialog","icon_right_arrow.png",64) ICON("widget/config","icon_config.png",64) -ICON("widget/resize","icon_resize.png",64) -ICON("widget/open","icon_check.png",64) -ICON("widget/close","icon_close.png",64) -ICON("widget/reset","icon_reset.png",64) +//ICON("widget/resize","icon_resize.png",64) +//ICON("widget/open","icon_check.png",64) +//ICON("widget/close","icon_close.png",64) +//ICON("widget/reset","icon_reset.png",64) /// Normal Icons /// @@ -22712,13 +22734,13 @@ ICON("enlightenment/picture","icon_wallpaper.png",64) ICON("enlightenment/gradient","icon_gradient.png",64) ICON("enlightenment/e","logo_white_128.png",64) //ICON("enlightenment/about","logo_black_128.png",64) -ICON("enlightenment/reset","icon_reset.png",128) -ICON("enlightenment/exit","icon_logout.png",64) -ICON("enlightenment/logout","icon_logout.png",128) -ICON("enlightenment/halt","icon_halt.png",128) -ICON("enlightenment/reboot","icon_reboot.png",128) -ICON("enlightenment/suspend","icon_suspend.png",128) -ICON("enlightenment/hibernate","icon_hibernate.png",128) +//ICON("enlightenment/reset","icon_reset.png",128) +//ICON("enlightenment/exit","icon_logout.png",64) +//ICON("enlightenment/logout","icon_logout.png",128) +//ICON("enlightenment/halt","icon_halt.png",128) +//ICON("enlightenment/reboot","icon_reboot.png",128) +//ICON("enlightenment/suspend","icon_suspend.png",128) +//ICON("enlightenment/hibernate","icon_hibernate.png",128) ICON("enlightenment/colors","icon_colors.png",64) ICON("enlightenment/themes","icon_theme.png",64) //Done but some ref still around..... ICON("enlightenment/screen_setup","icon_screen_setup.png",64) @@ -22728,7 +22750,7 @@ ICON("enlightenment/lost_windows","icon_lost_windows.png",64) 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/favorites","icon_favorites.png",64) //ICON("enlightenment/desktops","icon_desktops.png",64) //ICON("enlightenment/configuration","icon_configuration.png",64) ICON("enlightenment/settings","icon_configuration.png",64) @@ -22751,7 +22773,7 @@ ICON("enlightenment/mouse_wheel","icon_mouse_wheel.png",64) ICON("enlightenment/mouse_clean","icon_mouse_clean.png",64) ICON("enlightenment/keys","icon_keys.png",64) ICON("enlightenment/desklock","icon_desklock.png",64) -ICON("enlightenment/desklock_menu","icon_desklock_menu.png",128) +//ICON("enlightenment/desklock_menu","icon_desklock_menu.png",128) ICON("enlightenment/screen_resolution","icon_screen_resolution.png",64) ICON("enlightenment/shelf","icon_shelf.png",64) ICON("enlightenment/fonts","icon_fonts.png",64) @@ -22776,11 +22798,11 @@ ICON("enlightenment/file_icons","icon_file_icons.png",64) ICON("enlightenment/applications","icon_applications.png",64) ICON("enlightenment/add_application","icon_applications_new.png",64) ICON("enlightenment/ibar_applications","icon_applications_ibar.png",64) -ICON("enlightenment/autoscroll","icon_autoscroll.png",64) +//ICON("enlightenment/autoscroll","icon_autoscroll.png",64) ICON("enlightenment/restart_applications","icon_applications_restart.png",64) ICON("enlightenment/startup_applications","icon_applications_startup.png",64) ICON("enlightenment/power_management","icon_power_management.png",64) -ICON("enlightenment/screensaver","icon_screensaver.png",64) +//ICON("enlightenment/screensaver","icon_screensaver.png",64) ICON("enlightenment/pager","icon_pager.png",64) ICON("enlightenment/mixer","icon_mixer.png",64) ICON("enlightenment/scale","icon_scale.png",64) @@ -22922,10 +22944,6 @@ EFMICON("desktop","icon_efm_desktop.png", 128) EFMICON("hdd","icon_efm_hdd.png", 128) EFMICON("hd","icon_efm_hdd.png", 128) -ICON("drive-harddisk","icon_efm_hdd.png", 128) -ICON("drive-optical","icon_efm_cd.png", 128) -ICON("media-flash","icon_efm_flash.png", 128) - // EFM Mime type icons // diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 4ec6160c1..cc7bc070d 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -356,7 +356,7 @@ ACT_FN_GO(window_kill) e_dialog_title_set(kill_dialog, _("Are you sure you want to kill this window?")); e_dialog_text_set(kill_dialog, _(dialog_text)); - e_dialog_icon_set(kill_dialog, "enlightenment/exit", 64); + e_dialog_icon_set(kill_dialog, "application-exit", 64); e_dialog_button_add(kill_dialog, _("Yes"), NULL, _e_actions_cb_kill_dialog_ok, obj); e_dialog_button_add(kill_dialog, _("No"), NULL, @@ -1775,7 +1775,7 @@ ACT_FN_GO(exit) "
" "Are you sure you want to exit?" )); - e_dialog_icon_set(exit_dialog, "enlightenment/exit", 64); + e_dialog_icon_set(exit_dialog, "application-exit", 64); e_dialog_button_add(exit_dialog, _("Yes"), NULL, _e_actions_cb_exit_dialog_ok, NULL); e_dialog_button_add(exit_dialog, _("No"), NULL, @@ -1857,7 +1857,7 @@ ACT_FN_GO(logout) "
" "Are you sure you want to do this?" )); - e_dialog_icon_set(logout_dialog, "enlightenment/logout", 64); + e_dialog_icon_set(logout_dialog, "system-log-out", 64); e_dialog_button_add(logout_dialog, _("Yes"), NULL, _e_actions_cb_logout_dialog_ok, NULL); e_dialog_button_add(logout_dialog, _("No"), NULL, @@ -1921,7 +1921,7 @@ ACT_FN_GO(halt) "
" "Are you sure you want to shut down?" )); - e_dialog_icon_set(halt_dialog, "enlightenment/halt", 64); + e_dialog_icon_set(halt_dialog, "system-shutdown", 64); e_dialog_button_add(halt_dialog, _("Yes"), NULL, _e_actions_cb_halt_dialog_ok, NULL); e_dialog_button_add(halt_dialog, _("No"), NULL, @@ -1985,7 +1985,7 @@ ACT_FN_GO(reboot) "
" "Are you sure you want to restart it?" )); - e_dialog_icon_set(reboot_dialog, "enlightenment/reboot", 64); + e_dialog_icon_set(reboot_dialog, "system-restart", 64); e_dialog_button_add(reboot_dialog, _("Yes"), NULL, _e_actions_cb_reboot_dialog_ok, NULL); e_dialog_button_add(reboot_dialog, _("No"), NULL, @@ -2049,7 +2049,7 @@ ACT_FN_GO(suspend) "
" "Are you sure you want to suspend?" )); - e_dialog_icon_set(suspend_dialog, "enlightenment/suspend", 64); + e_dialog_icon_set(suspend_dialog, "system-suspend", 64); e_dialog_button_add(suspend_dialog, _("Yes"), NULL, _e_actions_cb_suspend_dialog_ok, NULL); e_dialog_button_add(suspend_dialog, _("No"), NULL, @@ -2113,7 +2113,7 @@ ACT_FN_GO(hibernate) "
" "Are you sure you want to suspend to disk?" )); - e_dialog_icon_set(hibernate_dialog, "enlightenment/hibernate", 64); + e_dialog_icon_set(hibernate_dialog, "system-suspend-hibernate", 64); e_dialog_button_add(hibernate_dialog, _("Yes"), NULL, _e_actions_cb_hibernate_dialog_ok, NULL); e_dialog_button_add(hibernate_dialog, _("No"), NULL, diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c index 0d16ba5ff..926f6de7a 100644 --- a/src/bin/e_config_dialog.c +++ b/src/bin/e_config_dialog.c @@ -197,7 +197,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) else e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), - _("Advanced"), "widget/new_dialog", + _("Advanced"), "go-next", _e_config_dialog_cb_advanced, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } @@ -226,7 +226,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) else e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), - _("Basic"), "widget/new_dialog", + _("Basic"), "go-next", _e_config_dialog_cb_basic, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index ff02e99b3..6d64808d6 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -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_theme_icon_set(mi, "enlightenment/autoscroll"); + e_util_menu_item_theme_icon_set(mi, "transform-move"); 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_theme_icon_set(mi, "widget/resize"); + e_util_menu_item_theme_icon_set(mi, "transform-scale"); 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,7 +1291,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, _("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, _e_gadcon_client_cb_menu_edit, gcc); } diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index 53ee5b0e3..30b4041d9 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -482,7 +482,7 @@ _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, _("To Favorites Menu")); e_menu_item_callback_set(submi, _e_border_menu_cb_fav_add, bd); - e_util_menu_item_theme_icon_set(submi, "enlightenment/favorites"); + e_util_menu_item_theme_icon_set(submi, "user-bookmarks"); submi = e_menu_item_new(subm); e_menu_item_label_set(submi, _("To Launcher")); diff --git a/src/bin/e_int_border_prop.c b/src/bin/e_int_border_prop.c index 424a56001..b097a0b63 100644 --- a/src/bin/e_int_border_prop.c +++ b/src/bin/e_int_border_prop.c @@ -360,14 +360,14 @@ _bd_go(void *data, void *data2) { o = _bd_icccm_create(dia, NULL); e_widget_list_object_append(c, o, 1, 1, 0.0); - ob = e_widget_button_add(e_win_evas_get(dia->win), _("NetWM"), "widget/new_dialog", + ob = e_widget_button_add(e_win_evas_get(dia->win), _("NetWM"), "go-next", _bd_go, dia, (void *)1); } else { o = _bd_netwm_create(dia, NULL); e_widget_list_object_append(c, o, 1, 1, 0.0); - ob = e_widget_button_add(e_win_evas_get(dia->win), _("ICCCM"), "widget/new_dialog", + ob = e_widget_button_add(e_win_evas_get(dia->win), _("ICCCM"), "go-next", _bd_go, dia, (void *)0); } diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 99df7ee11..2eab71349 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -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_theme_icon_set(mi, "enlightenment/favorites"); + e_util_menu_item_theme_icon_set(mi, "user-bookmarks"); e_menu_item_submenu_set(mi, subm); } } @@ -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_theme_icon_set(mi, "enlightenment/reset"); + e_util_menu_item_theme_icon_set(mi, "system-restart"); 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_theme_icon_set(mi, "enlightenment/exit"); + e_util_menu_item_theme_icon_set(mi, "application-exit"); e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL); l = eina_hash_find(_e_int_menus_augmentation, "main/7"); diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 9f229aebe..9d1eeb1f8 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -1617,7 +1617,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_theme_icon_set(mi, "widget/resize"); + e_util_menu_item_theme_icon_set(mi, "transform-scale"); e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es); mi = e_menu_item_new(m); diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c index 234f53929..f96026c60 100644 --- a/src/bin/e_sys.c +++ b/src/bin/e_sys.c @@ -312,7 +312,7 @@ _e_sys_cb_logout_timer(void *data) if (dia) { e_dialog_title_set(dia, _("Logout problems")); - e_dialog_icon_set(dia, "enlightenment/logout", 64); + e_dialog_icon_set(dia, "system-log-out", 64); e_dialog_text_set(dia, _("Logout is taking too long. Some
" "applications refuse to close.
" @@ -366,7 +366,7 @@ _e_sys_logout_begin(E_Sys_Action a_after) _("Logout in progress.
" "Please wait.")); e_obj_dialog_show(od); - e_obj_dialog_icon_set(od, "enlightenment/logout"); + e_obj_dialog_icon_set(od, "system-log-out"); if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog)); _e_sys_dialog = od; _e_sys_action_after = a_after; @@ -532,7 +532,7 @@ _e_sys_action_do(E_Sys_Action a, char *param) _("Power off.
" "Please wait.")); e_obj_dialog_show(od); - e_obj_dialog_icon_set(od, "enlightenment/halt"); + e_obj_dialog_icon_set(od, "system-shutdown"); if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog)); e_obj_dialog_cb_delete_set(od, _e_sys_dialog_cb_delete); _e_sys_dialog = od; @@ -559,7 +559,7 @@ _e_sys_action_do(E_Sys_Action a, char *param) _("Resetting.
" "Please wait.")); e_obj_dialog_show(od); - e_obj_dialog_icon_set(od, "enlightenment/reboot"); + e_obj_dialog_icon_set(od, "system-restart"); if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog)); e_obj_dialog_cb_delete_set(od, _e_sys_dialog_cb_delete); _e_sys_dialog = od; @@ -585,7 +585,7 @@ _e_sys_action_do(E_Sys_Action a, char *param) _("Suspending.
" "Please wait.")); e_obj_dialog_show(od); - e_obj_dialog_icon_set(od, "enlightenment/suspend"); + e_obj_dialog_icon_set(od, "system-suspend"); if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog)); e_obj_dialog_cb_delete_set(od, _e_sys_dialog_cb_delete); _e_sys_dialog = od; @@ -611,7 +611,7 @@ _e_sys_action_do(E_Sys_Action a, char *param) _("Hibernating.
" "Please wait.")); e_obj_dialog_show(od); - e_obj_dialog_icon_set(od, "enlightenment/hibernate"); + e_obj_dialog_icon_set(od, "system-suspend-hibernate"); if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog)); _e_sys_dialog = od; e_obj_dialog_cb_delete_set(od, _e_sys_dialog_cb_delete); diff --git a/src/bin/e_test.c b/src/bin/e_test.c index 8ed216525..1fe314cbc 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -158,8 +158,8 @@ _e_test_internal(E_Container *con) e_dialog_text_set(dia, "A Test Dialog
And another line
Hilighted Text"); e_dialog_icon_set(dia, "preference-plugin", 64); e_dialog_button_add(dia, "OK", NULL, NULL, NULL); - e_dialog_button_add(dia, "Apply", "enlightenment/reset", NULL, NULL); - e_dialog_button_add(dia, "Cancel", "enlightenment/exit", NULL, NULL); + e_dialog_button_add(dia, "Apply", "system-restart", NULL, NULL); + e_dialog_button_add(dia, "Cancel", "application-exit", NULL, NULL); e_win_centered_set(dia->win, 1); e_dialog_show(dia); } diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c index 0430fd655..6511d976a 100644 --- a/src/bin/e_toolbar.c +++ b/src/bin/e_toolbar.c @@ -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_theme_icon_set(mi, "widget/resize"); + e_util_menu_item_theme_icon_set(mi, "transform-scale"); e_menu_item_callback_set(mi, _e_toolbar_menu_cb_edit, tbar); mi = e_menu_item_new(mn); diff --git a/src/bin/e_widget_config_list.c b/src/bin/e_widget_config_list.c index 663f3616b..099077b7d 100644 --- a/src/bin/e_widget_config_list.c +++ b/src/bin/e_widget_config_list.c @@ -80,13 +80,13 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas, e_widget_ilist_go(o); e_widget_table_object_append(wd->gui.table, o, 0, 4, 2, 1, 1, 1, 1, 1); - o = e_widget_button_add(evas, _("Up"), "widget/up_arrow", + o = e_widget_button_add(evas, _("Up"), "go-up", _button_cb_up, wd, NULL); wd->gui.up = o; e_widget_disabled_set(o, 1); e_widget_table_object_append(wd->gui.table, o, 0, 5, 1, 1, 1, 0, 1, 0); - o = e_widget_button_add(evas, _("Down"), "widget/down_arrow", + o = e_widget_button_add(evas, _("Down"), "go-down", _button_cb_down, wd, NULL); wd->gui.down = o; e_widget_disabled_set(o, 1); diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index d2c2ae441..b67df8b72 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -291,7 +291,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, e_widget_sub_object_add(obj, o); e_widget_table_object_append(wd->o_table2, o, 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", _e_wid_fsel_button_up, wd, NULL); wd->o_up_button = o; e_widget_sub_object_add(obj, o); diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index 22320721e..ddbf9d445 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 502ae20ec..78394e8aa 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 fe9743d50..9ddf40f05 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 a736a1532..0ea5d4684 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 267dc5247..26bb9baa1 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 f145fefd3..03164d07f 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 edcb70955..0ee60d227 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 a3b3ded03..e4d9e4ac2 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 bb682715e..4fcfd39fe 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 067d44701..e4e38f8c0 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 7535ca6fa..f19ec9711 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 ea7da62bd..3a9dee384 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 d1b089ae9..1a45630e4 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 75ff3afb7..447d8db2d 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 f838673ac..12aeea485 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 85cb2f045..bf37f7301 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 e7799a209..4c1059a7f 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 746c3def8..878941864 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 b0ba59938..259e14d5d 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);