More icon works, this commit include changes to the icons on the desktop.

You will probably loose desktop icons until you get a fresh profile. Or you can edit the
.desktop files in .e/e/fileman/favorites (new icons name are: user-desktop, user-home, computer and user-temp)

Sorry for bothering... the next commit should be the last ;)



SVN revision: 39419
This commit is contained in:
Davide Andreoli 2009-03-08 23:09:48 +00:00
parent 408a00d7c2
commit 3d41cbb20d
60 changed files with 319 additions and 345 deletions

Binary file not shown.

View File

@ -22794,6 +22794,7 @@ 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) */
/* http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html */
//Standard Action Icons
ICON("help-about","logo_black_128.png",64) // "enlightenment/about"
@ -22803,6 +22804,23 @@ ICON("go-up","icon_up_arrow.png",64) // "widget/up_ar
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("bookmark-new","icon_add_fav.png",64) // "widget/add_fav"
ICON("edit-swap","icon_swap.png",64) // *** // "widget/swap"
ICON("edit-copy","icon_efm_copy.png",16) // EFMBUTTON("copy"
ICON("edit-cut","icon_efm_cut.png",16) // EFMBUTTON("cut"
ICON("edit-paste","icon_efm_paste.png",16) // EFMBUTTON("paste"
ICON("edit-delete","icon_efm_delete.png",16) // EFMBUTTON("delete"
ICON("edit-rename","icon_efm_rename.png",16) // EFMBUTTON("rename"
ICON("edit-select-all","icon_efm_select.png",16) // EFMBUTTON("select"
ICON("document-open","icon_efm_open.png",16) // "widget/open" EFMBUTTON("open") EFMBUTTON("new")
ICON("document-new","icon_new.png",64) // "widget/new"
ICON("document-properties","icon_efm_properties.png",16) // EFMBUTTON("properties"
ICON("folder-new","icon_efm_new_dir.png",16) // EFMBUTTON("new_dir"
ICON("view-sort","icon_efm_sort.png",16) // *** // EFMBUTTON("sort",
ICON("view-order","icon_efm_sort.png",16) // *** // EFMBUTTON("ordering"
ICON("view-hidden-files","icon_efm_view.png",16) // *** // EFMBUTTON("hidden_files"
ICON("configure","icon_config.png",64) // "widget/config"
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"
@ -22812,35 +22830,79 @@ ICON("system-log-out","icon_logout.png",128) // "enlightenmen
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"
ICON("view-refresh","icon_efm_refresh.png",16) // EFMBUTTON("refresh"
ICON("view-inherit","icon_dummy.png",64) // *** // EFMBUTTON("inherit"
//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"
ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman"
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-color","icon_colors.png",64) // "enlightenment/colors"
ICON("preferences-desktop-font","icon_fonts.png",64) // "enlightenment/fonts"
ICON("preferences-desktop-screensaver","icon_screensaver.png",64) // "enlightenment/screensaver"
ICON("preferences-desktop-display","icon_screen_setup.png",64) // "enlightenment/screen_setup"
ICON("preferences-desktop-keyboard","icon_keys.png",64) // "enlightenment/keys"
ICON("preferences-desktop-pointer","icon_mouse.png",64) // *** // "enlightenment/mouse"
ICON("preferences-desktop-mouse","icon_mouse_clean.png",64) // "enlightenment/mouse_clean"
ICON("preferences-desktop-mouse-left","icon_mouse_left.png",64) // *** // "enlightenment/mouse_left"
ICON("preferences-desktop-mouse-right","icon_mouse_right.png",64) // *** // "enlightenment/mouse_right"
ICON("preferences-desktop-mouse-middle","icon_mouse_middle.png",64) // *** // "enlightenment/mouse_middle"
ICON("preferences-desktop-mouse-wheel","icon_mouse_wheel.png",64) // *** // "enlightenment/mouse_wheel"
ICON("preferences-desktop-mouse-extra","icon_mouse_extra.png",64) // *** // "enlightenment/mouse_extra"
ICON("preferences-desktop-locale","icon_intl.png",64) // "enlightenment/intl"
ICON("preferences-desktop-mixer","icon_mixer.png",64) // "enlightenment/mixer"
ICON("preferences-desktop-shelf","icon_shelf.png",64) // *** // "enlightenment/shelf"
ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)// *** // "enlightenment/shelf_bottom_desk"
ICON("preferences-desktop-shelf-custom","icon_shelf_custom.png",64) // *** // "enlightenment/shelf_custom"
ICON("preferences-desktop-shelf-dock","icon_shelf_dock.png",64) // *** // "enlightenment/shelf_dock"
ICON("preferences-desktop-shelf-menu-bar","icon_shelf_menu_bar.png",64) // *** // "enlightenment/shelf_menu_bar"
ICON("preferences-desktop-shelf-panel","icon_shelf_panel.png",64) // *** // "enlightenment/shelf_panel"
ICON("preferences-desktop-shelf-top-desk","icon_shelf_top_desk.png",64) // *** // "enlightenment/shelf_top_desk"
ICON("preferences-desktop-window-remember","icon_window_remembers.png",64) // *** // "enlightenment/window_remembers"
ICON("preferences-position-bottom","icon_shelf_bottom.png",64) // *** // "enlightenment/shelf_position_bottom"
ICON("preferences-position-bottom-left","icon_shelf_bottom_left.png",64) // *** // "enlightenment/shelf_position_bottom_left"
ICON("preferences-position-bottom-right","icon_shelf_bottom_right.png",64) // *** // "enlightenment/shelf_position_bottom_right"
ICON("preferences-position-top","icon_shelf_top.png",64) // *** // "enlightenment/shelf_position_top"
ICON("preferences-position-top-left","icon_shelf_top_left.png",64) // *** // "enlightenment/shelf_position_top_left"
ICON("preferences-position-top-right","icon_shelf_top_right.png",64) // *** // "enlightenment/shelf_position_top_right"
ICON("preferences-position-left","icon_shelf_left.png",64) // *** // "enlightenment/shelf_position_left"
ICON("preferences-position-left-top","icon_shelf_left_top.png",64) // *** // "enlightenment/shelf_position_left_top"
ICON("preferences-position-left-bottom","icon_shelf_left_bottom.png",64) // *** // "enlightenment/shelf_position_left_bottom"
ICON("preferences-position-right","icon_shelf_right.png",64) // *** // "enlightenment/shelf_position_right"
ICON("preferences-position-right-top","icon_shelf_right_top.png",64) // *** // "enlightenment/shelf_position_right_top"
ICON("preferences-position-right-bottom","icon_shelf_right_bottom.png",64) // *** // "enlightenment/shelf_position_right_bottom"
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" "enlightenment/showhide"
ICON("preferences-system-performance","icon_performance.png",64) // "enlightenment/performance"
ICON("preferences-system-power-management","icon_power_management.png",64) // "enlightenment/power_management"
ICON("preferences-system-screen-resolution","icon_screen_resolution.png",64)// *** // "enlightenment/screen_resolution"
ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman"
ICON("application-exit","icon_logout.png",64) // "enlightenment/exit"
//Standard Emblem Icons
ICON("emblem-symbolic-link","icon_dummy.png",64) // EFMBUTTON("symlink"
//Standard Place Icons
ICON("user-home","icon_efm_home.png",64)
ICON("user-desktop","icon_efm_desktop.png",64)
ICON("folder","icon_efm_folder.png",64) // "fileman/folder"
ICON("user-home","icon_efm_home.png",64) // "fileman/home"
ICON("user-temp","icon_efm_tmp.png",64) // *** // "fileman/tmp"
ICON("user-desktop","icon_efm_desktop.png",64) // "fileman/desktop"
ICON("user-bookmarks","icon_favorites.png",64) // "enlightenment/favorites"
ICON("folder","icon_efm_folder.png",64)
ICON("folder-image","icon_wallpaper.png",64) // "enlightenment/picture"
//Standard Device Icons
ICON("computer","icon_efm_root.png", 64) // "fileman/root"
ICON("drive-harddisk","icon_efm_hdd.png", 128) // "fileman/hd"
ICON("drive-harddisk","icon_efm_hdd.png", 128) // "fileman/hd" "fileman/hdd"
ICON("drive-optical","icon_efm_cd.png", 128) // "fileman/??"
ICON("media-flash","icon_efm_flash.png", 128) // "fileman/??"
@ -22858,16 +22920,16 @@ ICONMIME("inode/socket","icon_efm_file.png",128)
// Widget Icons //
//ICON("enlightenment/check","icon_check.png",64)
ICON("widget/swap","icon_swap.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/add","icon_add.png",64)
ICON("widget/add_fav","icon_add_fav.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/config","icon_config.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)
@ -22877,8 +22939,8 @@ ICON("widget/config","icon_config.png",64)
//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)
//ICON("enlightenment/background","icon_wallpaper.png",64)
//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)
@ -22889,13 +22951,13 @@ ICON("enlightenment/e","logo_white_128.png",64)
//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)
//ICON("enlightenment/colors","icon_colors.png",64)
//ICON("enlightenment/themes","icon_theme.png",64)
//ICON("enlightenment/screen_setup","icon_screen_setup.png",64)
//ICON("enlightenment/windows","icon_windows.png",64)
ICON("enlightenment/showhide","icon_windows.png",64)
//ICON("enlightenment/showhide","icon_windows.png",64)
ICON("enlightenment/lost_windows","icon_lost_windows.png",64)
ICON("enlightenment/window_remembers","icon_window_remembers.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)
@ -22904,7 +22966,7 @@ ICON("enlightenment/focus","icon_window_focus.png",64)
ICON("enlightenment/settings","icon_configuration.png",64)
ICON("enlightenment/engine","icon_engine.png",64)
ICON("enlightenment/dialogs","icon_dummy.png",64)
ICON("enlightenment/intl","icon_intl.png",64)
//ICON("enlightenment/intl","icon_intl.png",64)
ICON("enlightenment/interaction","icon_interaction.png",64)
ICON("enlightenment/imc","icon_imc.png",64)
ICON("enlightenment/system","icon_system.png",64)
@ -22912,23 +22974,23 @@ ICON("enlightenment/system","icon_system.png",64)
ICON("enlightenment/directories","icon_directories.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)
ICON("enlightenment/mouse_right","icon_mouse_right.png",64)
ICON("enlightenment/mouse_middle","icon_mouse_middle.png",64)
ICON("enlightenment/mouse_extra","icon_mouse_extra.png",64)
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/mouse","icon_mouse.png",64)
//ICON("enlightenment/mouse_left","icon_mouse_left.png",64)
//ICON("enlightenment/mouse_right","icon_mouse_right.png",64)
//ICON("enlightenment/mouse_middle","icon_mouse_middle.png",64)
//ICON("enlightenment/mouse_extra","icon_mouse_extra.png",64)
//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/screen_resolution","icon_screen_resolution.png",64)
ICON("enlightenment/shelf","icon_shelf.png",64)
ICON("enlightenment/fonts","icon_fonts.png",64)
//ICON("enlightenment/screen_resolution","icon_screen_resolution.png",64)
//ICON("enlightenment/shelf","icon_shelf.png",64)
//ICON("enlightenment/fonts","icon_fonts.png",64)
ICON("enlightenment/icon_theme","icon_icon_theme.png",64)
ICON("enlightenment/transitions","icon_transitions.png",64)
ICON("enlightenment/toolbar","icon_toolbar.png",64)
ICON("enlightenment/performance","icon_performance.png",64)
//ICON("enlightenment/performance","icon_performance.png",64)
ICON("enlightenment/profiles","icon_profiles.png",64)
ICON("enlightenment/startup","icon_startup.png",64)
ICON("enlightenment/winlist","icon_winlist.png",64)
@ -22949,10 +23011,10 @@ ICON("enlightenment/ibar_applications","icon_applications_ibar.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/power_management","icon_power_management.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/mixer","icon_mixer.png",64)
ICON("enlightenment/scale","icon_scale.png",64)
ICON("enlightenment/screen_normal","icon_screen_normal.png",64)
ICON("enlightenment/screen_around","icon_screen_around.png",64)
@ -22960,24 +23022,24 @@ ICON("enlightenment/screen_left","icon_screen_left.png",64)
ICON("enlightenment/screen_right","icon_screen_right.png",64)
ICON("enlightenment/screen_vflip","icon_screen_vflip.png",64)
ICON("enlightenment/screen_hflip","icon_screen_hflip.png",64)
ICON("enlightenment/shelf_position_bottom","icon_shelf_bottom.png",64)
ICON("enlightenment/shelf_position_bottom_left","icon_shelf_bottom_left.png",64)
ICON("enlightenment/shelf_position_bottom_right","icon_shelf_bottom_right.png",64)
ICON("enlightenment/shelf_position_top","icon_shelf_top.png",64)
ICON("enlightenment/shelf_position_top_left","icon_shelf_top_left.png",64)
ICON("enlightenment/shelf_position_top_right","icon_shelf_top_right.png",64)
ICON("enlightenment/shelf_position_left","icon_shelf_left.png",64)
ICON("enlightenment/shelf_position_left_top","icon_shelf_left_top.png",64)
ICON("enlightenment/shelf_position_left_bottom","icon_shelf_left_bottom.png",64)
ICON("enlightenment/shelf_position_right","icon_shelf_right.png",64)
ICON("enlightenment/shelf_position_right_top","icon_shelf_right_top.png",64)
ICON("enlightenment/shelf_position_right_bottom","icon_shelf_right_bottom.png",64)
ICON("enlightenment/shelf_bottom_desk","icon_shelf_bottom_desk.png",64)
ICON("enlightenment/shelf_custom","icon_shelf_custom.png",64)
ICON("enlightenment/shelf_dock","icon_shelf_dock.png",64)
ICON("enlightenment/shelf_menu_bar","icon_shelf_menu_bar.png",64)
ICON("enlightenment/shelf_panel","icon_shelf_panel.png",64)
ICON("enlightenment/shelf_top_desk","icon_shelf_top_desk.png",64)
//ICON("enlightenment/shelf_position_bottom","icon_shelf_bottom.png",64)
//ICON("enlightenment/shelf_position_bottom_left","icon_shelf_bottom_left.png",64)
//ICON("enlightenment/shelf_position_bottom_right","icon_shelf_bottom_right.png",64)
//ICON("enlightenment/shelf_position_top","icon_shelf_top.png",64)
//ICON("enlightenment/shelf_position_top_left","icon_shelf_top_left.png",64)
//ICON("enlightenment/shelf_position_top_right","icon_shelf_top_right.png",64)
//ICON("enlightenment/shelf_position_left","icon_shelf_left.png",64)
//ICON("enlightenment/shelf_position_left_top","icon_shelf_left_top.png",64)
//ICON("enlightenment/shelf_position_left_bottom","icon_shelf_left_bottom.png",64)
//ICON("enlightenment/shelf_position_right","icon_shelf_right.png",64)
//ICON("enlightenment/shelf_position_right_top","icon_shelf_right_top.png",64)
//ICON("enlightenment/shelf_position_right_bottom","icon_shelf_right_bottom.png",64)
//ICON("enlightenment/shelf_bottom_desk","icon_shelf_bottom_desk.png",64)
//ICON("enlightenment/shelf_custom","icon_shelf_custom.png",64)
//ICON("enlightenment/shelf_dock","icon_shelf_dock.png",64)
//ICON("enlightenment/shelf_menu_bar","icon_shelf_menu_bar.png",64)
//ICON("enlightenment/shelf_panel","icon_shelf_panel.png",64)
//ICON("enlightenment/shelf_top_desk","icon_shelf_top_desk.png",64)
// Window Border menu icons //
@ -23037,28 +23099,28 @@ group { name: "e/fileman/default/button/"NAME; \
} \
}
EFMBUTTON("open","icon_efm_open.png")
EFMBUTTON("copy","icon_efm_copy.png")
EFMBUTTON("cut","icon_efm_cut.png")
EFMBUTTON("paste","icon_efm_paste.png")
EFMBUTTON("delete","icon_efm_delete.png")
EFMBUTTON("properties","icon_efm_properties.png")
EFMBUTTON("rename","icon_efm_rename.png")
EFMBUTTON("arrange_name","icon_efm_arrange_name.png")
EFMBUTTON("arrange","icon_efm_arrange.png")
EFMBUTTON("arrange_time","icon_efm_arrange_time.png")
EFMBUTTON("new","icon_efm_new.png")
EFMBUTTON("new_dir","icon_efm_new_dir.png")
EFMBUTTON("refresh","icon_efm_refresh.png")
EFMBUTTON("view_details","icon_efm_view_details.png")
EFMBUTTON("view_name","icon_efm_view_name.png")
EFMBUTTON("view","icon_efm_view.png")
EFMBUTTON("select","icon_efm_select.png")
EFMBUTTON("sort","icon_efm_sort.png")
EFMBUTTON("ordering","icon_efm_sort.png")
EFMBUTTON("hidden_files","icon_efm_view.png")
EFMBUTTON("inherit","icon_dummy.png")
EFMBUTTON("symlink","icon_dummy.png")
//EFMBUTTON("open","icon_efm_open.png")
//EFMBUTTON("copy","icon_efm_copy.png")
//EFMBUTTON("cut","icon_efm_cut.png")
//EFMBUTTON("paste","icon_efm_paste.png")
//EFMBUTTON("delete","icon_efm_delete.png")
//EFMBUTTON("properties","icon_efm_properties.png")
//EFMBUTTON("rename","icon_efm_rename.png")
//EFMBUTTON("arrange_name","icon_efm_arrange_name.png")// NOT USED
//EFMBUTTON("arrange","icon_efm_arrange.png")// NOT USED
//EFMBUTTON("arrange_time","icon_efm_arrange_time.png")// NOT USED
//EFMBUTTON("new","icon_efm_new.png")
//EFMBUTTON("new_dir","icon_efm_new_dir.png")
//EFMBUTTON("refresh","icon_efm_refresh.png")
//EFMBUTTON("view_details","icon_efm_view_details.png") NOT USED
//EFMBUTTON("view_name","icon_efm_view_name.png") NOT USED
//EFMBUTTON("view","icon_efm_view.png") NOT USED
//EFMBUTTON("select","icon_efm_select.png")
//EFMBUTTON("sort","icon_efm_sort.png")
//EFMBUTTON("ordering","icon_efm_sort.png")
//EFMBUTTON("hidden_files","icon_efm_view.png")
//EFMBUTTON("inherit","icon_dummy.png")
//EFMBUTTON("symlink","icon_dummy.png")
// EFM icons //
@ -23078,19 +23140,19 @@ group { name: "e/icons/fileman/"NAME; \
} \
}
EFMICON("folder","icon_efm_folder.png", 128)
//EFMICON("folder","icon_efm_folder.png", 128)
EFMICON("chrdev","icon_efm_file.png", 128)
EFMICON("blkdev","icon_efm_file.png", 128)
EFMICON("fifo","icon_efm_file.png", 128)
EFMICON("socket","icon_efm_file.png", 128)
EFMICON("executable","icon_efm_file.png", 128)
EFMICON("file","icon_efm_file.png", 128)
EFMICON("home","icon_efm_home.png", 128)
EFMICON("root","icon_efm_root.png", 128)
EFMICON("tmp","icon_efm_tmp.png", 128)
EFMICON("desktop","icon_efm_desktop.png", 128)
EFMICON("hdd","icon_efm_hdd.png", 128)
EFMICON("hd","icon_efm_hdd.png", 128)
//EFMICON("home","icon_efm_home.png", 128)
//EFMICON("root","icon_efm_root.png", 128)
//EFMICON("tmp","icon_efm_tmp.png", 128)
//EFMICON("desktop","icon_efm_desktop.png", 128)
//EFMICON("hdd","icon_efm_hdd.png", 128)
//EFMICON("hd","icon_efm_hdd.png", 128)
// EFM Mime type icons //

View File

@ -491,10 +491,7 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
mi = e_menu_item_new(sd->popup);
e_menu_item_label_set(mi, _("Delete"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/delete"),
"e/fileman/default/button/delete");
e_util_menu_item_theme_icon_set(mi, "edit-delete");
e_menu_item_callback_set(mi, _e_entry_cb_delete, sd);
mi = e_menu_item_new(sd->popup);
@ -504,10 +501,7 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
mi = e_menu_item_new(sd->popup);
e_menu_item_label_set(mi, _("Cut"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/cut"),
"e/fileman/default/button/cut");
e_util_menu_item_theme_icon_set(mi, "edit-cut");
e_menu_item_callback_set(mi, _e_entry_cb_cut, sd);
}
}
@ -515,10 +509,7 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
mi = e_menu_item_new(sd->popup);
e_menu_item_label_set(mi, _("Copy"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/copy"),
"e/fileman/default/button/copy");
e_util_menu_item_theme_icon_set(mi, "edit-copy");
e_menu_item_callback_set(mi, _e_entry_cb_copy, sd);
}
}
@ -526,9 +517,7 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
mi = e_menu_item_new(sd->popup);
e_menu_item_label_set(mi, _("Paste"));
e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/paste"),
"e/fileman/default/button/paste");
e_util_menu_item_theme_icon_set(mi, "edit-paste");
e_menu_item_callback_set(mi, _e_entry_cb_paste, sd);
}
if (!s_empty)
@ -538,9 +527,7 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
mi = e_menu_item_new(sd->popup);
e_menu_item_label_set(mi, _("Select All"));
e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/select"),
"e/fileman/default/button/select");
e_util_menu_item_theme_icon_set(mi, "edit-select-all");
e_menu_item_callback_set(mi, _e_entry_cb_select_all, sd);
}

View File

@ -1559,11 +1559,11 @@ _e_fm2_icon_explicit_edje_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__, const
static Evas_Object *
_e_fm2_icon_explicit_theme_icon_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__, const char *name, const char **type_ret)
{
Evas_Object *o = edje_object_add(evas);
Evas_Object *o = e_icon_add(evas);
if (!o)
return NULL;
if (!e_util_edje_icon_set(o, name))
if (!e_util_icon_theme_set(o, name))
{
evas_object_del(o);
return NULL;
@ -5436,10 +5436,7 @@ _e_fm_drop_menu(char *args)
item = e_menu_item_new(menu);
e_menu_item_label_set(item, _("Copy"));
e_menu_item_callback_set(item, _e_fm_drop_menu_copy_cb, args);
e_menu_item_icon_edje_set(item,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/copy"),
"e/fileman/default/button/copy");
e_util_menu_item_theme_icon_set(item, "edit-copy");
item = e_menu_item_new(menu);
e_menu_item_label_set(item, _("Move"));
@ -5452,10 +5449,7 @@ _e_fm_drop_menu(char *args)
item = e_menu_item_new(menu);
e_menu_item_label_set(item, _("Link"));
e_menu_item_callback_set(item, _e_fm_drop_menu_symlink_cb, args);
e_menu_item_icon_edje_set(item,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/symlink"),
"e/fileman/default/button/symlink");
e_util_menu_item_theme_icon_set(item, "emblem-symbolic-link");
item = e_menu_item_new(menu);
e_menu_item_separator_set(item, 1);
@ -7038,10 +7032,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Inherit parent settings"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/inherit"),
"e/fileman/default/button/inherit");
e_util_menu_item_theme_icon_set(mi, "view-inherit");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->inherited_dir_props);
e_menu_item_callback_set(mi, _e_fm2_toggle_inherit_dir_props, sd);
@ -7057,10 +7048,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Refresh View"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/refresh"),
"e/fileman/default/button/refresh");
e_util_menu_item_theme_icon_set(mi, "view-refresh");
e_menu_item_callback_set(mi, _e_fm2_refresh, sd);
}
@ -7068,10 +7056,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Show Hidden Files"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/hidden_files"),
"e/fileman/default/button/hidden_files");
e_util_menu_item_theme_icon_set(mi,"view-refresh");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->show_hidden_files);
e_menu_item_callback_set(mi, _e_fm2_toggle_hidden_files, sd);
@ -7083,10 +7068,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Remember Ordering"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/ordering"),
"e/fileman/default/button/ordering");
e_util_menu_item_theme_icon_set(mi, "view-order");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->order_file);
e_menu_item_callback_set(mi, _e_fm2_toggle_ordering, sd);
@ -7095,10 +7077,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Sort Now"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/ordering"),
"e/fileman/default/button/sort");
e_util_menu_item_theme_icon_set(mi, "view-sort");
e_menu_item_callback_set(mi, _e_fm2_sort, sd);
}
}
@ -7110,10 +7089,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("New Directory"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/new_dir"),
"e/fileman/default/button/new_dir");
e_util_menu_item_theme_icon_set(mi, "folder-new");
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
}
@ -7129,10 +7105,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Paste"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/paste"),
"e/fileman/default/button/paste");
e_util_menu_item_theme_icon_set(mi, "edit-paste");
e_menu_item_callback_set(mi, _e_fm2_file_paste_menu, sd);
}
@ -7140,10 +7113,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Link"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/symlink"),
"e/fileman/default/button/symlink");
e_util_menu_item_theme_icon_set(mi, "emblem-symbolic-link");
e_menu_item_callback_set(mi, _e_fm2_file_symlink_menu, sd);
}
}
@ -7221,10 +7191,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, _("Inherit parent settings"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/inherit"),
"e/fileman/default/button/inherit");
e_util_menu_item_theme_icon_set(mi, "view-inherit");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->inherited_dir_props);
e_menu_item_callback_set(mi, _e_fm2_toggle_inherit_dir_props, sd);
@ -7240,10 +7207,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, _("Refresh View"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/refresh"),
"e/fileman/default/button/refresh");
e_util_menu_item_theme_icon_set(mi, "view-refresh");
e_menu_item_callback_set(mi, _e_fm2_refresh, sd);
}
@ -7251,10 +7215,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, _("Show Hidden Files"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/hidden_files"),
"e/fileman/default/button/hidden_files");
e_util_menu_item_theme_icon_set(mi, "view-hidden-files");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->show_hidden_files);
e_menu_item_callback_set(mi, _e_fm2_toggle_hidden_files, sd);
@ -7266,10 +7227,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, _("Remember Ordering"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/ordering"),
"e/fileman/default/button/ordering");
e_util_menu_item_theme_icon_set(mi, "view-order");
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, sd->order_file);
e_menu_item_callback_set(mi, _e_fm2_toggle_ordering, sd);
@ -7278,10 +7236,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, _("Sort Now"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/ordering"),
"e/fileman/default/button/sort");
e_util_menu_item_theme_icon_set(mi, "view-sort");
e_menu_item_callback_set(mi, _e_fm2_sort, sd);
}
}
@ -7296,10 +7251,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, _("New Directory"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/new_dir"),
"e/fileman/default/button/new_dir");
e_util_menu_item_theme_icon_set(mi, "folder-new");
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
}
}
@ -7312,10 +7264,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, _("Cut"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/cut"),
"e/fileman/default/button/cut");
e_util_menu_item_theme_icon_set(mi, "edit-cut");
e_menu_item_callback_set(mi, _e_fm2_file_cut_menu, sd);
}
}
@ -7329,10 +7278,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, _("Copy"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/copy"),
"e/fileman/default/button/copy");
e_util_menu_item_theme_icon_set(mi, "edit-copy");
e_menu_item_callback_set(mi, _e_fm2_file_copy_menu, sd);
}
@ -7345,10 +7291,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, _("Paste"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/paste"),
"e/fileman/default/button/paste");
e_util_menu_item_theme_icon_set(mi, "edit-paste");
e_menu_item_callback_set(mi, _e_fm2_file_paste_menu, sd);
}
@ -7356,10 +7299,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, _("Link"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/symlink"),
"e/fileman/default/button/symlink");
e_util_menu_item_theme_icon_set(mi, "emblem-symbolic-link");
e_menu_item_callback_set(mi, _e_fm2_file_symlink_menu, sd);
}
}
@ -7416,10 +7356,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, _("Delete"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/delete"),
"e/fileman/default/button/delete");
e_util_menu_item_theme_icon_set(mi, "edit-delete");
e_menu_item_callback_set(mi, _e_fm2_file_delete_menu, ic);
}
@ -7427,20 +7364,14 @@ _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, _("Rename"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/rename"),
"e/fileman/default/button/rename");
e_util_menu_item_theme_icon_set(mi, "edit-rename");
e_menu_item_callback_set(mi, _e_fm2_file_rename, ic);
}
}
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Properties"));
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
"e/fileman/default/button/properties"),
"e/fileman/default/button/properties");
e_util_menu_item_theme_icon_set(mi, "document-properties");
e_menu_item_callback_set(mi, _e_fm2_file_properties, ic);
if (ic->info.mime)

View File

@ -474,7 +474,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, _("Keyboard Shortcut"));
e_menu_item_callback_set(submi, _e_border_menu_cb_kbdshrtct_add, bd);
e_util_menu_item_theme_icon_set(submi, "enlightenment/keys");
e_util_menu_item_theme_icon_set(submi, "preferences-desktop-keyboard");
}
submi = e_menu_item_new(subm);

View File

@ -41,7 +41,7 @@ const CFTypes _types[] =
{"appearance", N_("Appearance"), "enlightenment/appearance"},
{"config", N_("Settings"), "preferences-system"},
{"fileman", N_("File Manager"), "system-file-manager"},
{"shelf", N_("Shelf"), "enlightenment/shelf"},
{"shelf", N_("Shelf"), "preferences-desktop-shelf"}, //FIXME use gadget icon
{"system", N_("System"), "enlightenment/system"},
{NULL, NULL, NULL}
};

View File

@ -56,7 +56,7 @@ _e_int_gadcon_config(E_Gadcon *gc, const char *title)
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, title, "E", "_gadcon_config_dialog",
"enlightenment/shelf", 0, v, gc);
"preferences-desktop-shelf", 0, v, gc);
gc->config_dialog = cfd;
e_dialog_resizable_set(cfd->dia, 1);
}

View File

@ -261,7 +261,7 @@ e_int_menus_desktops_new(void)
subm = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Shelves"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-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_theme_icon_set(mi, "enlightenment/showhide");
e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
e_menu_item_callback_set(mi, _e_int_menus_main_showhide, NULL);
return m;
@ -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_theme_icon_set(mi, "enlightenment/shelf_position_left");
e_util_menu_item_theme_icon_set(mi, "preferences-position-left");
break;
case E_GADCON_ORIENT_RIGHT:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_right");
e_util_menu_item_theme_icon_set(mi, "preferences-position-right");
break;
case E_GADCON_ORIENT_TOP:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_top");
e_util_menu_item_theme_icon_set(mi, "preferences-position-top");
break;
case E_GADCON_ORIENT_BOTTOM:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_bottom");
e_util_menu_item_theme_icon_set(mi, "preferences-position-bottom");
break;
case E_GADCON_ORIENT_CORNER_TL:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_top_left");
e_util_menu_item_theme_icon_set(mi, "preferences-position-top-left");
break;
case E_GADCON_ORIENT_CORNER_TR:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_top_right");
e_util_menu_item_theme_icon_set(mi, "preferences-position-top-right");
break;
case E_GADCON_ORIENT_CORNER_BL:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_bottom_left");
e_util_menu_item_theme_icon_set(mi, "preferences-position-bottom-left");
break;
case E_GADCON_ORIENT_CORNER_BR:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_bottom_right");
e_util_menu_item_theme_icon_set(mi, "preferences-position-bottom-right");
break;
case E_GADCON_ORIENT_CORNER_LT:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_left_top");
e_util_menu_item_theme_icon_set(mi, "preferences-position-left-top");
break;
case E_GADCON_ORIENT_CORNER_RT:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_right_top");
e_util_menu_item_theme_icon_set(mi, "preferences-position-right-top");
break;
case E_GADCON_ORIENT_CORNER_LB:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_left_bottom");
e_util_menu_item_theme_icon_set(mi, "preferences-position-left-bottom");
break;
case E_GADCON_ORIENT_CORNER_RB:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf_position_right_bottom");
e_util_menu_item_theme_icon_set(mi, "preferences-position-right-bottom");
break;
default:
e_util_menu_item_theme_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
break;
}
}

View File

@ -70,7 +70,7 @@ e_int_shelf_config(E_Shelf *es)
cfd = e_config_dialog_new(es->zone->container,
_("Shelf Settings"),
"E", "_shelf_config_dialog",
"enlightenment/shelf", 0, v, es);
"preferences-desktop-shelf", 0, v, es);
es->config_dialog = cfd;
}
}
@ -498,17 +498,17 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
of = e_widget_framelist_add(evas, _("Layout"), 0);
rg = e_widget_radio_group_new(&(cfdata->mode));
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_dock", 64, 24, MODE_BOTTOM_MIDDLE, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-dock", 64, 24, MODE_BOTTOM_MIDDLE, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_panel", 64, 24, MODE_BOTTOM_ALL, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-panel", 64, 24, MODE_BOTTOM_ALL, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_bottom_desk", 64, 24, MODE_BOTTOM_DESKTOP, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-bottom-desk", 64, 24, MODE_BOTTOM_DESKTOP, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_menu_bar", 64, 24, MODE_TOP_ALL, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-menu-bar", 64, 24, MODE_TOP_ALL, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_top_desk", 64, 24, MODE_TOP_DESKTOP, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-top-desk", 64, 24, MODE_TOP_DESKTOP, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_custom", 64, 24, MODE_CUSTOM, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-desktop-shelf-custom", 64, 24, MODE_CUSTOM, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(ol, of, 1, 1, 0.5);
@ -528,7 +528,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_list_object_append(o, ol, 0, 0, 0.5);
ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL);
ob = e_widget_button_add(evas, _("Configure Contents..."), "configure", _cb_configure, cfdata, NULL);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
return o;
@ -563,29 +563,29 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
of = e_widget_frametable_add(evas, _("Layout"), 1);
rg = e_widget_radio_group_new(&(cfdata->orient));
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left", 24, 24, E_GADCON_ORIENT_LEFT, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left", 24, 24, E_GADCON_ORIENT_LEFT, rg);
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right", 24, 24, E_GADCON_ORIENT_RIGHT, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right", 24, 24, E_GADCON_ORIENT_RIGHT, rg);
e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top", 24, 24, E_GADCON_ORIENT_TOP, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top", 24, 24, E_GADCON_ORIENT_TOP, rg);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom", 24, 24, E_GADCON_ORIENT_BOTTOM, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom", 24, 24, E_GADCON_ORIENT_BOTTOM, rg);
e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_left", 24, 24, E_GADCON_ORIENT_CORNER_TL, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-left", 24, 24, E_GADCON_ORIENT_CORNER_TL, rg);
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_right", 24, 24, E_GADCON_ORIENT_CORNER_TR, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-right", 24, 24, E_GADCON_ORIENT_CORNER_TR, rg);
e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_left", 24, 24, E_GADCON_ORIENT_CORNER_BL, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-left", 24, 24, E_GADCON_ORIENT_CORNER_BL, rg);
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_right", 24, 24, E_GADCON_ORIENT_CORNER_BR, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-right", 24, 24, E_GADCON_ORIENT_CORNER_BR, rg);
e_widget_frametable_object_append(of, ob, 2, 4, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_top", 24, 24, E_GADCON_ORIENT_CORNER_LT, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-top", 24, 24, E_GADCON_ORIENT_CORNER_LT, rg);
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_top", 24, 24, E_GADCON_ORIENT_CORNER_RT, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-top", 24, 24, E_GADCON_ORIENT_CORNER_RT, rg);
e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_bottom", 24, 24, E_GADCON_ORIENT_CORNER_LB, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-bottom", 24, 24, E_GADCON_ORIENT_CORNER_LB, rg);
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_bottom", 24, 24, E_GADCON_ORIENT_CORNER_RB, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-bottom", 24, 24, E_GADCON_ORIENT_CORNER_RB, rg);
e_widget_frametable_object_append(of, ob, 2, 3, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
@ -633,7 +633,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(o2, of, 1, 1, 0.5);
ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL);
ob = e_widget_button_add(evas, _("Configure Contents..."), "configure", _cb_configure, cfdata, NULL);
e_widget_list_object_append(o2, ob, 0, 0, 0.5);
e_widget_list_object_append(o, o2, 0, 0, 0.0);

View File

@ -28,7 +28,7 @@ e_int_toolbar_config(E_Toolbar *tbar)
v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("Toolbar Settings"), "E",
"_toolbar_config_dialog", "enlightenment/shelf",
"_toolbar_config_dialog", "preferences-desktop-shelf",
0, v, tbar);
tbar->cfg_dlg = cfd;
}
@ -82,19 +82,19 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
ot = e_widget_frametable_add(evas, _("Layout"), 1);
rg = e_widget_radio_group_new(&(cfdata->orient));
/*
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left",
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left",
24, 24, E_GADCON_ORIENT_LEFT, rg);
e_widget_frametable_object_append(ot, ow, 0, 1, 1, 1, 1, 1, 1, 1);
*/
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top",
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top",
24, 24, E_GADCON_ORIENT_TOP, rg);
e_widget_frametable_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 1, 1);
/*
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right",
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right",
24, 24, E_GADCON_ORIENT_RIGHT, rg);
e_widget_frametable_object_append(ot, ow, 2, 1, 1, 1, 1, 1, 1, 1);
*/
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom",
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom",
24, 24, E_GADCON_ORIENT_BOTTOM, rg);
e_widget_frametable_object_append(ot, ow, 0, 1, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.5);

View File

@ -1107,7 +1107,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_theme_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-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);
@ -1625,12 +1625,12 @@ _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_theme_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "configure");
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_theme_icon_set(mi, "enlightenment/shelf");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_contents, es);
mi = e_menu_item_new(m);

View File

@ -38,7 +38,7 @@ e_theme_init(void)
Eina_List *l = NULL;
/* Register mime handler */
theme_hdl = e_fm2_mime_handler_new(_("Set As Theme"), "enlightenment/themes",
theme_hdl = e_fm2_mime_handler_new(_("Set As Theme"), "preferences-desktop-theme",
e_theme_handler_set, NULL,
e_theme_handler_test, NULL);
if (theme_hdl) e_fm2_mime_handler_glob_add(theme_hdl, "*.edj");

View File

@ -324,7 +324,7 @@ _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_theme_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "configure");
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_config, tbar);
mi = e_menu_item_new(mn);

View File

@ -285,7 +285,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
wd->o_table2 = o;
e_widget_sub_object_add(obj, o);
o = e_widget_button_add(evas, _("Add to Favorites"), "widget/add_fav",
o = e_widget_button_add(evas, _("Add to Favorites"), "bookmark-new",
_e_wid_fsel_favorites_add, wd, NULL);
wd->o_favorites_add = o;
e_widget_sub_object_add(obj, o);

View File

@ -115,10 +115,10 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico
if (icon)
{
o2 = edje_object_add(evas);
o2 = e_icon_add(evas);
wd->o_icon = o2;
e_util_edje_icon_set(o2, icon);
edje_extern_object_min_size_set(o2, icon_w, icon_h);
e_util_icon_theme_set(o2, icon);
evas_object_size_hint_min_set(o2, icon_w, icon_h);
edje_object_part_swallow(wd->o_radio, "e.swallow.icon", o2);
evas_object_show(o2);
e_widget_sub_object_add(obj, o2);

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_theme_icon_set(mi, "widget/config");
e_util_menu_item_theme_icon_set(mi, "configure");
e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, NULL);
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);

View File

@ -128,7 +128,7 @@ e_int_config_color_classes(E_Container *con, const char *params __UNUSED__)
v->advanced.create_widgets = _adv_create_widgets;
cfd = e_config_dialog_new(con, _("Colors"), "E", "_config_color_classes_dialog",
"enlightenment/colors", 0, v, NULL);
"preferences-desktop-color", 0, v, NULL);
return cfd;
}

View File

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes);
e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "preferences-desktop-color", e_int_config_color_classes);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

View File

@ -159,7 +159,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
if (cfdata->bg)
e_widget_preview_edje_set(ob, cfdata->bg, "e/desktop/background");
e_widget_frametable_object_append(of, ob, 0, 0, 3, 1, 1, 1, 1, 0);
ob = e_widget_button_add(evas, _("Configure"), "widget/config",
ob = e_widget_button_add(evas, _("Configure"), "configure",
_cb_config, cfdata, NULL);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);

View File

@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "enlightenment/desklock", e_int_config_desklock);
conf_module = m;
e_module_delayed_set(m, 1);

View File

@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
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);

View File

@ -188,7 +188,7 @@ _surebox_new(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
cfdata->surebox = sb;
sb->dia->data = sb;
e_dialog_title_set(sb->dia, _("Resolution change"));
e_dialog_icon_set(sb->dia, "enlightenment/screen_resolution", 48);
e_dialog_icon_set(sb->dia, "preferences-system-screen-resolution", 48);
_surebox_text_fill(sb);
e_win_delete_callback_set(sb->dia->win, _surebox_dialog_cb_delete);
e_dialog_button_add(sb->dia, _("Save"), NULL, _surebox_dialog_cb_yes, sb);
@ -226,8 +226,8 @@ e_int_config_display(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Screen Resolution Settings"),
"E", "_config_display_dialog",
"enlightenment/screen_resolution", 0, v, NULL);
"E", "_config_display_dialog",
"preferences-system-screen-resolution", 0, v, NULL);
return cfd;
}

View File

@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
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_resolution", 20, _("Screen Resolution"), NULL, "enlightenment/screen_resolution", e_int_config_display);
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
e_configure_registry_item_add("screen/screen_resolution", 20, _("Screen Resolution"), NULL, "preferences-system-screen-resolution", e_int_config_display);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

View File

@ -57,7 +57,7 @@ _e_int_config_dpms_capable(void)
e_dialog_title_set(dpms_dialog, _("Display Power Management Signaling"));
e_dialog_text_set(dpms_dialog, _("The current display server is not <br>"
"DPMS capable."));
e_dialog_icon_set(dpms_dialog, "enlightenment/power_management", 64);
e_dialog_icon_set(dpms_dialog, "preferences-system-power-management", 64);
e_dialog_button_add(dpms_dialog, _("OK"), NULL, _cb_dpms_dialog_ok, NULL);
e_dialog_button_focus_num(dpms_dialog, 1);
e_win_centered_set(dpms_dialog->win, 1);
@ -78,7 +78,7 @@ _e_int_config_dpms_available(void)
e_dialog_title_set(dpms_dialog, _("Display Power Management Signaling"));
e_dialog_text_set(dpms_dialog, _("The current display server does not <br>"
"have the DPMS extension."));
e_dialog_icon_set(dpms_dialog, "enlightenment/power_management", 64);
e_dialog_icon_set(dpms_dialog, "preferences-system-power-management", 64);
e_dialog_button_add(dpms_dialog, _("OK"), NULL, _cb_dpms_dialog_ok, NULL);
e_dialog_button_focus_num(dpms_dialog, 1);
e_win_centered_set(dpms_dialog->win, 1);
@ -107,7 +107,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E",
"_config_dpms_dialog", "enlightenment/power_management",
"_config_dpms_dialog", "preferences-system-power-management",
0, v, NULL);
return cfd;
}

View File

@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
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/power_management", 50, _("Power Management"), NULL, "enlightenment/power_management", e_int_config_dpms);
e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
e_configure_registry_item_add("screen/power_management", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_dpms);
conf_module = m;
e_module_delayed_set(m, 1);
return m;