styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Icon rename finished. Now we have a fully compliant icon theme :) 

now I'm going to fix E-MODULE-EXTRA...


SVN revision: 39495
This commit is contained in:
Davide Andreoli 2009-03-15 17:41:46 +00:00
parent 2422e04b20
commit eb2d1db1dc
86 changed files with 211 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
data/themes/default.edc
View File

@ -22793,8 +22793,19 @@ 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 */
/* FreeDesktop.Org Icons
* http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
*
* In the comment you can find the old e icon name.
*
* Icons marked with *** are not mentioned in the spec, but we still try to
* follow the naming convention.
*
* TO ADD A NEW ICON:
* 1. Search for a name in the spec OR
* 2. Search for a name in kde (oxigen) and gnome (tango - human) icon set OR
* 3. Try to follow the naming convention
*/
//Standard Action Icons
ICON("help-about","logo_black_128.png",64) // "enlightenment/about"
@ -22838,6 +22849,7 @@ ICON("view-inherit","icon_dummy.png",64) // *** // EFMBUTTON("in
//Standard Status Icons
ICON("dialog-warning","icon_warning.png",128) // "enlightenment/warning"
ICON("unknown","icon_dummy.png",64) // *** // "enlightenment/unknown"
//Standard Application Icons
ICON("preferences-desktop","icon_desktops.png",64) // "enlightenment/desktops"
@ -22880,14 +22892,58 @@ ICON("preferences-position-right","icon_shelf_right.png",64) //
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-window-manipulation","icon_window_manipulation.png",64) // *** // "enlightenment/window_manipulation"
ICON("preferences-window-maximize","icon_window_manipulation.png",64) // *** // "enlightenment/window_maximize"
ICON("preferences-window-stacking","icon_winlist.png",64) // *** // "enlightenment/window_stacking"
ICON("preferences-window-geometry","icon_window_manipulation.png",64) // *** // "enlightenment/window_geometry"
ICON("preferences-windows-lost","icon_lost_windows.png",64) // *** // "enlightenment/lost_windows"
ICON("preferences-gradient","icon_gradient.png",64) // *** // "enlightenment/gradient"
ICON("preferences-focus","icon_window_focus.png",64) // *** // "enlightenment/focus"
ICON("preferences-engine","icon_engine.png",64) // *** // "enlightenment/engine"
ICON("preferences-dialogs","icon_dummy.png",64) // *** // "enlightenment/dialogs"
ICON("preferences-interaction","icon_interaction.png",64) // *** // "enlightenment/interaction"
ICON("preferences-imc","icon_imc.png",64) // *** // "enlightenment/imc"
ICON("preferences-desklock","icon_desklock.png",64) // *** // "enlightenment/desklock"
ICON("preferences-icon-theme","icon_icon_theme.png",64) // *** // "enlightenment/icon_theme"
ICON("preferences-transitions","icon_transitions.png",64) // *** // "enlightenment/transitions"
ICON("preferences-toolbar","icon_toolbar.png",64) // *** // "enlightenment/toolbar"
ICON("preferences-profiles","icon_profiles.png",64) // *** // "enlightenment/profiles"
ICON("preferences-startup","icon_startup.png",64) // *** // "enlightenment/startup"
ICON("preferences-winlist","icon_winlist.png",64) // *** // "enlightenment/winlist"
ICON("preferences-menus","icon_menus.png",64) // *** // "enlightenment/menus"
ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** // "enlightenment/menu_settings"
ICON("preferences-advanced","icon_advanced.png",64) // *** // "enlightenment/advanced"
ICON("preferences-behavior","icon_behavior.png",64) // *** // "enlightenment/behavior"
ICON("preferences-appearance","icon_appearance.png",64) // *** // "enlightenment/appearance"
ICON("preferences-extensions","icon_extensions.png",64) // *** // "enlightenment/extensions"
ICON("preferences-file-icons","icon_file_icons.png",64) // *** // "enlightenment/file_icons"
ICON("preferences-pager","icon_pager.png",64) // *** // "enlightenment/pager"
ICON("preferences-scale","icon_scale.png",64) // *** // "enlightenment/scale"
ICON("preferences-directories","icon_directories.png",64) // *** // "enlightenment/directories"
ICON("preferences-screen-normal","icon_screen_normal.png",64) // *** // "enlightenment/screen_normal"
ICON("preferences-screen-around","icon_screen_around.png",64) // *** // "enlightenment/screen_around"
ICON("preferences-screen-left","icon_screen_left.png",64) // *** // "enlightenment/screen_left"
ICON("preferences-screen-right","icon_screen_right.png",64) // *** // "enlightenment/screen_right"
ICON("preferences-screen-vflip","icon_screen_vflip.png",64) // *** // "enlightenment/screen_vflip"
ICON("preferences-screen-hflip","icon_screen_hflip.png",64) // *** // "enlightenment/screen_hflip"
ICON("preferences-applications","icon_applications.png",64) // *** // "enlightenment/applications"
ICON("preferences-applications-add","icon_applications_new.png",64) // *** // "enlightenment/add_application"
ICON("preferences-applications-ibar","icon_applications_ibar.png",64) // *** // "enlightenment/ibar_applications"
ICON("preferences-applications-restart","icon_applications_restart.png",64) // *** // "enlightenment/restart_applications"
ICON("preferences-applications-startup","icon_applications_startup.png",64) // *** // "enlightenment/startup_applications"
ICON("preferences-plugin","icon_modules.png",64) // "enlightenment/modules"
ICON("preferences-system","icon_configuration.png",64) // "enlightenment/configuration"
ICON("preferences-system","icon_configuration.png",64) // "enlightenment/configuration" "enlightenment/settings"
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"
ICON("enlightenment","logo_white_128.png",64) // *** // "enlightenment/e"
//Standard Emblem Icons
ICON("emblem-symbolic-link","icon_dummy.png",64) // EFMBUTTON("symlink"
@ -22899,6 +22955,8 @@ 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-image","icon_wallpaper.png",64) // "enlightenment/picture"
ICON("network-website","icon_globe.png",64) // "enlightenment/website"
ICON("system","icon_system.png",64) // *** // "enlightenment/system"
//Standard Device Icons
ICON("computer","icon_efm_root.png", 64) // "fileman/root"
@ -22916,131 +22974,6 @@ ICONMIME("inode/directory","icon_efm_folder.png",128)
ICONMIME("inode/fifo","icon_efm_file.png",128)
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/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/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)
/// Normal Icons ///
//ICON("enlightenment/warning", "icon_warning.png",128)
ICON("enlightenment/website","icon_globe.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)
//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)
//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/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/desktops","icon_desktops.png",64)
//ICON("enlightenment/configuration","icon_configuration.png",64)
ICON("enlightenment/settings","icon_configuration.png",64)
ICON("enlightenment/engine","icon_engine.png",64)
ICON("enlightenment/dialogs","icon_dummy.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)
//ICON("enlightenment/run","icon_run.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/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/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/profiles","icon_profiles.png",64)
ICON("enlightenment/startup","icon_startup.png",64)
ICON("enlightenment/winlist","icon_winlist.png",64)
ICON("enlightenment/window_manipulation","icon_window_manipulation.png",64)
ICON("enlightenment/window_maximize","icon_window_manipulation.png",64)
ICON("enlightenment/window_stacking","icon_winlist.png",64)
ICON("enlightenment/window_geometry","icon_window_manipulation.png",64)
ICON("enlightenment/menus","icon_menus.png",64)
ICON("enlightenment/menu_settings","icon_menu_settings.png",64)
ICON("enlightenment/advanced","icon_advanced.png",64)
ICON("enlightenment/behavior","icon_behavior.png",64)
ICON("enlightenment/appearance","icon_appearance.png",64)
ICON("enlightenment/extensions","icon_extensions.png",64)
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/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/pager","icon_pager.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)
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)
// Window Border menu icons //
#define BORDERICON(NAME, FILE) \
@ -23082,46 +23015,6 @@ BORDERICON("locks_user","icon_border_lock.png")
BORDERICON("locks_application","icon_border_lock.png")
BORDERICON("properties","icon_border_properties.png")
// EFM menu button icons //
#define EFMBUTTON(NAME, FILE) \
group { name: "e/fileman/default/button/"NAME; \
parts { \
part { name: "icon"; \
mouse_events: 0; \
description { state: "default" 0.0; \
aspect: 1.0 1.0; \
aspect_preference: BOTH; \
image.image: FILE COMP; \
image.normal: FILE ; \
} \
} \
} \
}
//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 //
#define EFMICON(NAME, FILE, SIZE) \

10
src/bin/e_border.c
View File

@ -3101,7 +3101,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
{
o = edje_object_add(evas);
if (!bd->internal_icon)
e_util_edje_icon_set(o, "enlightenment/e");
e_util_edje_icon_set(o, "enlightenment");
else
{
if (!bd->internal_icon_key)
@ -3112,7 +3112,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
if ((ext) && ((!strcmp(ext, ".edj"))))
{
if (!edje_object_file_set(o, bd->internal_icon, "icon"))
e_util_edje_icon_set(o, "enlightenment/e");
e_util_edje_icon_set(o, "enlightenment");
}
else if (ext)
{
@ -3125,7 +3125,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
evas_object_del(o);
o = e_icon_add(evas);
if (!e_util_icon_theme_set(o, bd->internal_icon))
e_util_icon_theme_set(o, "enlightenment/e");
e_util_icon_theme_set(o, "enlightenment");
}
}
else
@ -3167,8 +3167,8 @@ e_border_icon_add(E_Border *bd, Evas *evas)
}
}
o = edje_object_add(evas);
e_util_edje_icon_set(o, "enlightenment/unknown");
o = e_icon_add(evas);
e_util_icon_theme_set(o, "unknown");
return o;
}

4
src/bin/e_configure.c
View File

@ -12,7 +12,7 @@ static Eina_List *handlers = NULL;
EAPI void
e_configure_init(void)
{
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions");
e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "preferences-plugin", e_int_config_modules);
handlers = eina_list_append
@ -120,7 +120,7 @@ _e_configure_efreet_desktop_update(void)
snprintf(buf, sizeof(buf), "system/%s", label);
cfg_cat_cfg = buf;
ic = cfg_cat_icon;
if (!ic) ic = "enlightenment/system";
if (!ic) ic = "system";
e_configure_registry_category_add("system",
1000, _("System"),
NULL,

2
src/bin/e_eap_editor.c
View File

@ -214,7 +214,7 @@ _e_desktop_edit_view_create(E_Desktop_Edit *editor, E_Container *con)
editor->cfd =
e_config_dialog_new(con, _("Desktop Entry Editor"), "E",
"_desktop_editor_dialog",
"enlightenment/applications", 0, v, editor);
"preferences-applications", 0, v, editor);
if (!editor->cfd)
{

8
src/bin/e_fm.c
View File

@ -7041,7 +7041,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("View Mode"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
}
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@ -7200,7 +7200,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("View Mode"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
}
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@ -7827,7 +7827,7 @@ _e_fm2_new_directory(void *data, E_Menu *m, E_Menu_Item *mi)
con = e_container_current_get(man);
if (!con) return;
sd->entry_dialog = e_entry_dialog_show(_("Create a new Directory"), "enlightenment/e",
sd->entry_dialog = e_entry_dialog_show(_("Create a new Directory"), "enlightenment",
_("New Directory Name:"),
"", NULL, NULL,
_e_fm2_new_directory_yes_cb,
@ -7889,7 +7889,7 @@ _e_fm2_file_rename(void *data, E_Menu *m, E_Menu_Item *mi)
snprintf(text, PATH_MAX + 256,
_("Rename %s to:"),
ic->info.file);
ic->entry_dialog = e_entry_dialog_show(_("Rename File"), "enlightenment/e",
ic->entry_dialog = e_entry_dialog_show(_("Rename File"), "enlightenment",
text, ic->info.file, NULL, NULL,
_e_fm2_file_rename_yes_cb,
_e_fm2_file_rename_no_cb, ic);

2
src/bin/e_gadcon.c
View File

@ -1264,7 +1264,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Appearance"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
e_menu_item_submenu_set(mi, mn);
}

2
src/bin/e_int_border_menu.c
View File

@ -486,7 +486,7 @@ _e_border_menu_cb_application_add_pre(void *data, E_Menu *m, E_Menu_Item *mi)
e_menu_item_label_set(submi, _("To Launcher"));
e_menu_item_submenu_pre_callback_set(submi,
_e_border_menu_cb_ibar_add_pre, bd);
e_util_menu_item_theme_icon_set(submi, "enlightenment/ibar_applications");
e_util_menu_item_theme_icon_set(submi, "preferences-applications-ibar");
}
static void

4
src/bin/e_int_config_modules.c
View File

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

8
src/bin/e_int_menus.c
View File

@ -107,7 +107,7 @@ e_int_menus_main_new(void)
dat->all_apps = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Applications"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/applications");
e_util_menu_item_theme_icon_set(mi, "preferences-applications");
e_menu_item_submenu_set(mi, subm);
}
@ -139,7 +139,7 @@ e_int_menus_main_new(void)
dat->lost_clients = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Lost Windows"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/lost_windows");
e_util_menu_item_theme_icon_set(mi, "preferences-windows-lost");
e_menu_item_submenu_set(mi, subm);
*/
@ -156,7 +156,7 @@ e_int_menus_main_new(void)
dat->enlightenment = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Enlightenment"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/e");
e_util_menu_item_theme_icon_set(mi, "enlightenment");
e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(subm);
@ -1092,7 +1092,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
dat->lost_clients = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Lost Windows"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/lost_windows");
e_util_menu_item_theme_icon_set(mi, "preferences-windows-lost");
e_menu_item_submenu_set(mi, subm);
}

2
src/bin/e_module.c
View File

@ -503,7 +503,7 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m)
_("Would you like to unload this module?<br>"));
e_dialog_title_set(dia, title);
e_dialog_icon_set(dia, "enlightenment/e", 64);
e_dialog_icon_set(dia, "enlightenment", 64);
e_dialog_text_set(dia, buf);
e_dialog_button_add(dia, _("Yes"), NULL, _e_module_cb_dialog_disable, m);
e_dialog_button_add(dia, _("No"), NULL, NULL, NULL);

2
src/bin/e_shelf.c
View File

@ -1220,7 +1220,7 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
}
e_object_ref(E_OBJECT(es));
e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), "enlightenment/e",
e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), "enlightenment",
_("You requested to delete this shelf.<br>"
"<br>"
"Are you sure you want to delete it?"), NULL, NULL,

4
src/bin/e_toolbar.c
View File

@ -329,7 +329,7 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Configure Toolbar Contents"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/toolbar");
e_util_menu_item_theme_icon_set(mi, "preferences-toolbar");
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_contents, tbar);
}
@ -351,7 +351,7 @@ _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn)
subm = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, tbar->name);
e_util_menu_item_theme_icon_set(mi, "enlightenment/toolbar");
e_util_menu_item_theme_icon_set(mi, "preferences-toolbar");
e_menu_pre_activate_callback_set(subm, _e_toolbar_menu_cb_pre, tbar);
e_menu_item_submenu_set(mi, subm);
}

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

@ -1090,7 +1090,7 @@ e_modapi_init(E_Module *m)
snprintf(buf, sizeof(buf), "%s/e-module-battery.edj", e_module_dir_get(m));
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL,
"enlightenment/advanced");
"preferences-advanced");
e_configure_registry_item_add("advanced/battery", 100, _("Battery Meter"),
NULL, buf, e_int_config_battery_module);

8
src/modules/conf_applications/e_int_config_apps.c
View File

@ -105,7 +105,7 @@ e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__)
data = E_NEW(E_Config_Data, 1);
data->title = eina_stringshare_add(_("IBar Applications"));
data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
data->icon = eina_stringshare_add("enlightenment/ibar_applications");
data->icon = eina_stringshare_add("preferences-applications-ibar");
data->filename = eina_stringshare_add(buf);
return _create_dialog(con, data);
@ -120,7 +120,7 @@ e_int_config_apps_ibar_other(E_Container *con, const char *path)
data = E_NEW(E_Config_Data, 1);
data->title = eina_stringshare_add(_("IBar Applications"));
data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
data->icon = eina_stringshare_add("enlightenment/ibar_applications");
data->icon = eina_stringshare_add("preferences-applications-ibar");
data->filename = eina_stringshare_add(path);
return _create_dialog(con, data);
@ -137,7 +137,7 @@ e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__)
data = E_NEW(E_Config_Data, 1);
data->title = eina_stringshare_add(_("Startup Applications"));
data->dialog = eina_stringshare_add("_config_apps_startup_dialog");
data->icon = eina_stringshare_add("enlightenment/startup_applications");
data->icon = eina_stringshare_add("preferences-applications-startup");
data->filename = eina_stringshare_add(buf);
return _create_dialog(con, data);
@ -154,7 +154,7 @@ e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__)
data = E_NEW(E_Config_Data, 1);
data->title = eina_stringshare_add(_("Restart Applications"));
data->dialog = eina_stringshare_add("_config_apps_restart_dialog");
data->icon = eina_stringshare_add("enlightenment/restart_applications");
data->icon = eina_stringshare_add("preferences-applications-restart");
data->filename = eina_stringshare_add(buf);
return _create_dialog(con, data);

12
src/modules/conf_applications/e_mod_main.c
View File

@ -31,14 +31,14 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("applications", 20, _("Apps"), NULL, "enlightenment/applications");
e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "enlightenment/add_application", e_int_config_apps_add);
e_configure_registry_item_add("applications/ibar_applications", 20, _("IBar Applications"), NULL, "enlightenment/ibar_applications", e_int_config_apps_ibar);
e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "enlightenment/restart_applications", e_int_config_apps_restart);
e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "enlightenment/startup_applications", e_int_config_apps_startup);
e_configure_registry_category_add("applications", 20, _("Apps"), NULL, "preferences-applications");
e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "preferences-applications-add", e_int_config_apps_add);
e_configure_registry_item_add("applications/ibar_applications", 20, _("IBar Applications"), NULL, "preferences-applications-ibar", e_int_config_apps_ibar);
e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "preferences-applications-restart", e_int_config_apps_restart);
e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "preferences-applications-startup", e_int_config_apps_startup);
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_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
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);

2
src/modules/conf_borders/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "preferences-system-windows", e_int_config_borders);
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "preferences-system-windows", e_int_config_borders_border);

2
src/modules/conf_clientlist/e_int_config_clientlist.c
View File

@ -39,7 +39,7 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con, _("Client List Settings"), "E",
"_config_clientlist_dialog",
"enlightenment/winlist", 0, v, NULL);
"preferences-winlist", 0, v, NULL);
return cfd;
}

4
src/modules/conf_clientlist/e_mod_main.c
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("menus", 60, _("Menus"), NULL, "enlightenment/menus");
e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "enlightenment/winlist", e_int_config_clientlist);
e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_colors/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
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);

2
src/modules/conf_desklock/e_int_config_desklock.c
View File

@ -70,7 +70,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
"_config_desklock_dialog", "enlightenment/desklock",
"_config_desklock_dialog", "preferences-desklock",
0, v, NULL);
return cfd;
}

2
src/modules/conf_desklock/e_mod_main.c
View File

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
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);
e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "preferences-desklock", e_int_config_desklock);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_dialogs/e_int_config_dialogs.c
View File

@ -35,7 +35,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Dialog Settings"),
"E", "_config_config_dialog_dialog",
"enlightenment/dialogs", 0, v, NULL);
"preferences-dialogs", 0, v, NULL);
return cfd;
}

2
src/modules/conf_dialogs/e_mod_main.c
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("settings", 80, _("Settings"), NULL, "enlightenment/settings");
e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "preferences-system");
e_configure_registry_item_add("settings/dialogs", 10, _("Dialogs"), NULL, "preferences-system", e_int_config_dialogs);
conf_module = m;
e_module_delayed_set(m, 1);

12
src/modules/conf_display/e_int_config_display.c
View File

@ -474,16 +474,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
{
of = e_widget_framelist_add(evas, _("Rotation"), 0);
rg = e_widget_radio_group_new(&(cfdata->rotation));
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_normal", 24, 24, ECORE_X_RANDR_ROT_0, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-normal", 24, 24, ECORE_X_RANDR_ROT_0, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_0)) e_widget_disabled_set(ob, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_left", 24, 24, ECORE_X_RANDR_ROT_90, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-left", 24, 24, ECORE_X_RANDR_ROT_90, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_90)) e_widget_disabled_set(ob, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_around", 24, 24, ECORE_X_RANDR_ROT_180, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-around", 24, 24, ECORE_X_RANDR_ROT_180, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_180)) e_widget_disabled_set(ob, 1);
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_right", 24, 24, ECORE_X_RANDR_ROT_270, rg);
ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-right", 24, 24, ECORE_X_RANDR_ROT_270, rg);
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_270)) e_widget_disabled_set(ob, 1);
e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 0, 1, 0);
@ -492,10 +492,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
if (cfdata->can_flip)
{
of = e_widget_framelist_add(evas, _("Mirroring"), 0);
ob = e_widget_check_icon_add(evas, NULL, "enlightenment/screen_hflip", 24, 24, &(cfdata->flip_x));
ob = e_widget_check_icon_add(evas, NULL, "preferences-screen-hflip", 24, 24, &(cfdata->flip_x));
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_flip & ECORE_X_RANDR_FLIP_X)) e_widget_disabled_set(ob, 1);
ob = e_widget_check_icon_add(evas, NULL, "enlightenment/screen_vflip", 24, 24, &(cfdata->flip_y));
ob = e_widget_check_icon_add(evas, NULL, "preferences-screen-vflip", 24, 24, &(cfdata->flip_y));
e_widget_framelist_object_append(of, ob);
if (!(cfdata->can_flip & ECORE_X_RANDR_FLIP_Y))
e_widget_disabled_set(ob, 1);

2
src/modules/conf_edgebindings/e_int_config_edgebindings.c
View File

@ -249,7 +249,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata->gui.o_del_all = ob;
e_widget_disabled_set(ob, 1);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment/e", _restore_edge_binding_defaults_cb, cfdata, NULL);
ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment", _restore_edge_binding_defaults_cb, cfdata, NULL);
e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 0, 1, 0);
e_widget_list_object_append(ol, of, 1, 1, 0.5);

2
src/modules/conf_edgebindings/e_mod_main.c
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("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
e_configure_registry_item_add("keyboard_and_mouse/edge_bindings", 10, _("Edge Bindings"), NULL, "enlightenment/edges", e_int_config_edgebindings);
conf_module = m;
e_module_delayed_set(m, 1);

4
src/modules/conf_engine/e_int_config_engine.c
View File

@ -37,7 +37,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Engine Settings"),
"E", "_config_engine_dialog",
"enlightenment/engine", 0, v, NULL);
"preferences-engine", 0, v, NULL);
return cfd;
}
@ -129,7 +129,7 @@ _cb_composite_change(void *data, Evas_Object *obj)
{
/* pop dialog */
e_confirm_dialog_show(_("Enable Composite Support ?"),
"enlightenment/engine",
"preferences-engine",
_("You have chosen to enable composite "
"support,<br>but your current screen does "
"not support composite.<br><br>"

4
src/modules/conf_engine/e_mod_main.c
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("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "enlightenment/engine", e_int_config_engine);
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "preferences-engine", e_int_config_engine);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_exebuf/e_mod_main.c
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("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
e_configure_registry_item_add("advanced/run_command", 40, _("Run Command"), NULL, "system-run", e_int_config_exebuf);
conf_module = m;
e_module_delayed_set(m, 1);

4
src/modules/conf_fonts/e_int_config_fonts.c
View File

@ -829,8 +829,8 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
tc->font = eina_stringshare_ref(cfdata->cur_font);
if (cfdata->cur_enabled)
{
icon = edje_object_add(cfdata->evas);
e_util_edje_icon_set(icon, "enlightenment/e");
icon = e_icon_add(cfdata->evas);
e_util_icon_theme_set(icon, "enlightenment");
}
e_widget_ilist_nth_icon_set(cfdata->gui.class_list, n, icon);
}

2
src/modules/conf_fonts/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "preferences-desktop-font", e_int_config_fonts);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_icon_theme/e_int_config_icon_themes.c
View File

@ -42,7 +42,7 @@ e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Icon Theme Settings"),
"E", "_config_icon_theme_dialog",
"enlightenment/icon_theme", 0, v, NULL);
"preferences-icon-theme", 0, v, NULL);
return cfd;
}

4
src/modules/conf_icon_theme/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "preferences-icon-theme", e_int_config_icon_themes);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

4
src/modules/conf_imc/e_int_config_imc.c
View File

@ -108,7 +108,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Input Method Settings"),
"E", "_config_imc_dialog",
"enlightenment/imc", 0, v, NULL);
"preferences-imc", 0, v, NULL);
return cfd;
}
@ -900,7 +900,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
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);
o = e_widget_button_add(evas, _("Import..."), "preferences-imc", _cb_import, cfdata, NULL);
e_widget_list_object_append(ol, o, 1, 0, 0.5);
e_widget_list_object_append(il, ol, 1, 0, 0.5);
e_widget_list_object_append(of, il, 1, 0, 0.0);

2
src/modules/conf_imc/e_int_config_imc_import.c
View File

@ -133,7 +133,7 @@ e_int_config_imc_import(E_Config_Dialog *parent)
e_win_size_min_set(win, w, h);
e_win_size_max_set(win, 99999, 99999);
e_win_show(win);
e_win_border_icon_set(win, "enlightenment/imc");
e_win_border_icon_set(win, "preferences-imc");
win->data = import;

2
src/modules/conf_imc/e_mod_main.c
View File

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("language", 70, _("Language"), NULL, "preferences-desktop-locale");
e_configure_registry_item_add("language/input_method_settings", 20, _("Input Method Settings"), NULL, "enlightenment/imc", e_int_config_imc);
e_configure_registry_item_add("language/input_method_settings", 20, _("Input Method Settings"), NULL, "preferences-imc", e_int_config_imc);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_interaction/e_int_config_interaction.c
View File

@ -36,7 +36,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Interaction Settings"),
"E", "_config_config_interaction_dialog",
"enlightenment/interaction", 0, v, NULL);
"preferences-interaction", 0, v, NULL);
return cfd;
}

4
src/modules/conf_interaction/e_mod_main.c
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("keyboard_and_mouse", 80, _("Input"), NULL, "enlightenment/behavior");
e_configure_registry_item_add("keyboard_and_mouse/interaction", 11, _("Interaction"), NULL, "enlightenment/interaction", e_int_config_interaction);
e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), NULL, "preferences-behavior");
e_configure_registry_item_add("keyboard_and_mouse/interaction", 11, _("Interaction"), NULL, "preferences-interaction", e_int_config_interaction);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -243,7 +243,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata->gui.o_del_all = ob;
e_widget_disabled_set(ob, 1);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment/e", _restore_key_binding_defaults_cb, cfdata, NULL);
ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment", _restore_key_binding_defaults_cb, cfdata, NULL);
e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);

2
src/modules/conf_keybindings/e_mod_main.c
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("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, _("Key Bindings"), NULL, "preferences-desktop-keyboard", e_int_config_keybindings);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_menus/e_int_config_menus.c
View File

@ -43,7 +43,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Menu Settings"),
"E", "_config_menus_dialog",
"enlightenment/menus", 0, v, NULL);
"preferences-menus", 0, v, NULL);
return cfd;
}

4
src/modules/conf_menus/e_mod_main.c
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("menus", 60, _("Menus"), NULL, "enlightenment/menus");
e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "enlightenment/menu_settings", e_int_config_menus);
e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "preferences-menu-settings", e_int_config_menus);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_mime/e_int_config_mime.c
View File

@ -62,7 +62,7 @@ e_int_config_mime(E_Container *con, const char *params __UNUSED__)
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("File Icons"), "E", "_config_mime_dialog",
"enlightenment/file_icons", 0, v, NULL);
"preferences-file-icons", 0, v, NULL);
return cfd;
}

2
src/modules/conf_mime/e_int_config_mime_edit.c
View File

@ -68,7 +68,7 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
cfd = e_config_dialog_new(con, _("File Icon"), "E",
"_config_mime_edit_dialog",
"enlightenment/file_icons", 0, v, cfdata);
"preferences-file-icons", 0, v, cfdata);
return cfd;
}

2
src/modules/conf_mime/e_mod_main.c
View File

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("fileman", 100, _("Files"), NULL, "system-file-manager");
e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), NULL, "enlightenment/file_icons", e_int_config_mime);
e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), NULL, "preferences-file-icons", e_int_config_mime);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_mouse/e_mod_main.c
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("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 30, _("Mouse Settings"), NULL, "preferences-desktop-mouse", e_int_config_mouse);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_mouse_cursor/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "preferences-desktop-pointer", e_int_config_cursor);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_mousebindings/e_int_config_mousebindings.c
View File

@ -292,7 +292,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata->gui.o_del_all = ob;
e_widget_disabled_set(ob, 1);
e_widget_frametable_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
ob = e_widget_button_add(evas, _("Restore Mouse and Wheel Binding Defaults"), "enlightenment/e",
ob = e_widget_button_add(evas, _("Restore Mouse and Wheel Binding Defaults"), "enlightenment",
_restore_mouse_binding_defaults_cb, cfdata, NULL);
e_widget_frametable_object_append(ot, ob, 0, 3, 2, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, ot, 1, 1, 0.5);

2
src/modules/conf_mousebindings/e_mod_main.c
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("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, _("Mouse Bindings"), NULL, "preferences-desktop-mouse", e_int_config_mousebindings);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_paths/e_int_config_paths.c
View File

@ -61,7 +61,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con, _("Search Path Settings"),
"E", "_config_paths_dialog",
"enlightenment/directories", 0, v, NULL);
"preferences-directories", 0, v, NULL);
return cfd;
}

4
src/modules/conf_paths/e_mod_main.c
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("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
e_configure_registry_item_add("advanced/search_directories", 50, _("Search Directories"), NULL, "enlightenment/directories", e_int_config_paths);
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
e_configure_registry_item_add("advanced/search_directories", 50, _("Search Directories"), NULL, "preferences-directories", e_int_config_paths);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_performance/e_mod_main.c
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("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_profiles/e_int_config_profiles.c
View File

@ -55,7 +55,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Profile Selector"),
"E", "_config_profiles_dialog",
"enlightenment/profiles", 0, v, NULL);
"preferences-profiles", 0, v, NULL);
e_config_dialog_changed_auto_set(cfd, 0);
return cfd;
}

4
src/modules/conf_profiles/e_mod_main.c
View File

@ -18,9 +18,9 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("settings", 80, _("Settings"),
NULL, "enlightenment/settings");
NULL, "preferences-system");
e_configure_registry_item_add("settings/profiles", 50, _("Profiles"),
NULL, "enlightenment/profiles",
NULL, "preferences-profiles",
e_int_config_profiles);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_scale/e_int_config_scale.c
View File

@ -40,7 +40,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Scaling Settings"),
"E", "_config_scale_dialog",
"enlightenment/scale", 0, v, NULL);
"preferences-scale", 0, v, NULL);
return cfd;
}

4
src/modules/conf_scale/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, "enlightenment/scale", e_int_config_scale);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, "preferences-scale", e_int_config_scale);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

28
src/modules/conf_shelves/e_int_config_shelf.c
View File

@ -132,47 +132,47 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
if (!label) label = _("Shelf #");
snprintf(buf, sizeof(buf), "%s %i", label, es->id);
ob = edje_object_add(evas);
ob = e_icon_add(evas);
switch (es->cfg->orient)
{
case E_GADCON_ORIENT_LEFT:
e_util_edje_icon_set(ob, "preferences-position-left");
e_util_icon_theme_set(ob, "preferences-position-left");
break;
case E_GADCON_ORIENT_RIGHT:
e_util_edje_icon_set(ob, "preferences-position-right");
e_util_icon_theme_set(ob, "preferences-position-right");
break;
case E_GADCON_ORIENT_TOP:
e_util_edje_icon_set(ob, "preferences-position-top");
e_util_icon_theme_set(ob, "preferences-position-top");
break;
case E_GADCON_ORIENT_BOTTOM:
e_util_edje_icon_set(ob, "preferences-position-bottom");
e_util_icon_theme_set(ob, "preferences-position-bottom");
break;
case E_GADCON_ORIENT_CORNER_TL:
e_util_edje_icon_set(ob, "preferences-position-top-left");
e_util_icon_theme_set(ob, "preferences-position-top-left");
break;
case E_GADCON_ORIENT_CORNER_TR:
e_util_edje_icon_set(ob, "preferences-position-top-right");
e_util_icon_theme_set(ob, "preferences-position-top-right");
break;
case E_GADCON_ORIENT_CORNER_BL:
e_util_edje_icon_set(ob, "preferences-position-bottom-left");
e_util_icon_theme_set(ob, "preferences-position-bottom-left");
break;
case E_GADCON_ORIENT_CORNER_BR:
e_util_edje_icon_set(ob, "preferences-position-bottom-right");
e_util_icon_theme_set(ob, "preferences-position-bottom-right");
break;
case E_GADCON_ORIENT_CORNER_LT:
e_util_edje_icon_set(ob, "preferences-position-left-top");
e_util_icon_theme_set(ob, "preferences-position-left-top");
break;
case E_GADCON_ORIENT_CORNER_RT:
e_util_edje_icon_set(ob, "preferences-position-right-top");
e_util_icon_theme_set(ob, "preferences-position-right-top");
break;
case E_GADCON_ORIENT_CORNER_LB:
e_util_edje_icon_set(ob, "preferences-position-left-bottom");
e_util_icon_theme_set(ob, "preferences-position-left-bottom");
break;
case E_GADCON_ORIENT_CORNER_RB:
e_util_edje_icon_set(ob, "preferences-position-right-bottom");
e_util_icon_theme_set(ob, "preferences-position-right-bottom");
break;
default:
e_util_edje_icon_set(ob, "enlightenment/e");
e_util_icon_theme_set(ob, "enlightenment");
break;
}
e_widget_ilist_append(cfdata->o_list, ob, buf,

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

@ -35,7 +35,7 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions");
e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, "preferences-desktop-shelf", e_int_config_shelf);
maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL);

2
src/modules/conf_startup/e_int_config_startup.c
View File

@ -38,7 +38,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Startup Settings"),
"E", "_config_startup_dialog",
"enlightenment/startup", 0, v, NULL);
"preferences-startup", 0, v, NULL);
return cfd;
}

4
src/modules/conf_startup/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, "enlightenment/startup", e_int_config_startup);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, "preferences-startup", e_int_config_startup);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

6
src/modules/conf_theme/e_int_config_theme.c
View File

@ -397,7 +397,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
_cb_import, cfdata, NULL);
e_widget_list_object_append(il, o, 1, 0, 0.5);
#ifdef HAVE_EXCHANGE
o = e_widget_button_add(evas, _(" Online..."), "enlightenment/website",
o = e_widget_button_add(evas, _(" Online..."), "network-website",
_cb_web, cfdata, NULL);
e_widget_list_object_append(il, o, 1, 0, 0.5);
#endif
@ -859,8 +859,8 @@ _cb_adv_btn_assign(void *data1, void *data2)
evas = evas_object_evas_get(oc);
n = e_widget_ilist_selected_get(oc);
ic = edje_object_add(evas);
e_util_edje_icon_set(ic, "enlightenment/e");
ic = e_icon_add(evas);
e_util_icon_theme_set(ic, "enlightenment");
e_widget_ilist_nth_icon_set(oc, n, ic);
newtheme = malloc(sizeof(E_Config_Theme));

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

@ -35,7 +35,7 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "preferences-desktop-theme", e_int_config_theme);
maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL);

2
src/modules/conf_transitions/e_int_config_transitions.c
View File

@ -43,7 +43,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con, _("Transition Settings"),
"E", "_config_transitions_dialog",
"enlightenment/transitions", 0, v, NULL);
"preferences-transitions", 0, v, NULL);
return cfd;
}

4
src/modules/conf_transitions/e_mod_main.c
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("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL, "preferences-transitions", e_int_config_transitions);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

8
src/modules/conf_wallpaper/e_int_config_wallpaper.c
View File

@ -549,13 +549,13 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
ow = e_widget_button_add(evas, _("Picture..."), "folder-image",
_cb_import, cfdata, NULL);
e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0);
ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
ow = e_widget_button_add(evas, _("Gradient..."), "preferences-gradient",
_cb_gradient, cfdata, NULL);
e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
#ifdef HAVE_EXCHANGE
if (online)
{
ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
ow = e_widget_button_add(evas, _("Online..."), "network-website",
_cb_web, cfdata, NULL);
e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
}
@ -677,13 +677,13 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
ow = e_widget_button_add(evas, _("Picture..."), "folder-image",
_cb_import, cfdata, NULL);
e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0);
ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
ow = e_widget_button_add(evas, _("Gradient..."), "preferences-gradient",
_cb_gradient, cfdata, NULL);
e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
#ifdef HAVE_EXCHANGE
if (online)
{
ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
ow = e_widget_button_add(evas, _("Online..."), "network-website",
_cb_web, cfdata, NULL);
e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
}

2
src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
View File

@ -201,7 +201,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
e_dialog_resizable_set(dia, 0);
e_dialog_show(dia);
e_dialog_border_icon_set(dia, "enlightenment/gradient");
e_dialog_border_icon_set(dia, "preferences-gradient");
return dia;
}

2
src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
View File

@ -120,7 +120,7 @@ e_int_config_wallpaper_web(E_Config_Dialog *parent)
web->parent = parent;
e_dialog_title_set(dia, _("Exchange wallpapers"));
e_dialog_border_icon_set(dia, "enlightenment/website");
e_dialog_border_icon_set(dia, "network-website");
e_dialog_resizable_set(dia, 1);
e_dialog_button_add(dia, _("Close"), NULL, _web_close_cb, web);

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

@ -25,7 +25,7 @@ EAPI E_Module_Api e_modapi =
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "preferences-desktop-wallpaper", e_int_config_wallpaper);
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk);

2
src/modules/conf_window_focus/e_int_config_focus.c
View File

@ -49,7 +49,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Focus Settings"),
"E", "_config_focus_dialog",
"enlightenment/focus", 0, v, NULL);
"preferences-focus", 0, v, NULL);
return cfd;
}

2
src/modules/conf_window_focus/e_mod_main.c
View File

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "enlightenment/focus", e_int_config_focus);
e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "preferences-focus", e_int_config_focus);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_window_manipulation/e_int_config_window_geometry.c
View File

@ -50,7 +50,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Window Geometry"),
"E", "_config_window_geometry_dialog",
"enlightenment/window_manipulation", 0, v, NULL);
"preferences-window-manipulation", 0, v, NULL);
return cfd;
}

2
src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
View File

@ -43,7 +43,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Window Maximize Policy"),
"E", "_config_window_maxpolicy_dialog",
"enlightenment/window_manipulation", 0, v, NULL);
"preferences-window-manipulation", 0, v, NULL);
return cfd;
}

2
src/modules/conf_window_manipulation/e_int_config_window_stacking.c
View File

@ -44,7 +44,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Window Stacking"),
"E", "_config_window_stacking_dialog",
"enlightenment/window_stacking", 0, v, NULL);
"preferences-window-stacking", 0, v, NULL);
return cfd;
}

6
src/modules/conf_window_manipulation/e_mod_main.c
View File

@ -32,9 +32,9 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
e_configure_registry_item_add("windows/window_geometry", 30, _("Window Geometry"), NULL, "enlightenment/window_geometry", e_int_config_window_geometry);
e_configure_registry_item_add("windows/window_stacking", 30, _("Window Stacking"), NULL, "enlightenment/window_stacking", e_int_config_window_stacking);
e_configure_registry_item_add("windows/window_maxpolicy", 30, _("Window Maximize Policy"), NULL, "enlightenment/window_maximize", e_int_config_window_maxpolicy);
e_configure_registry_item_add("windows/window_geometry", 30, _("Window Geometry"), NULL, "preferences-window-geometry", e_int_config_window_geometry);
e_configure_registry_item_add("windows/window_stacking", 30, _("Window Stacking"), NULL, "preferences-window-stacking", e_int_config_window_stacking);
e_configure_registry_item_add("windows/window_maxpolicy", 30, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

8
src/modules/conf_window_remembers/e_int_config_remembers.c
View File

@ -152,8 +152,8 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
ll = e_config->remembers;
ll = eina_list_sort(ll, -1, _cb_sort);
ic = edje_object_add(evas);
e_util_edje_icon_set(ic, "enlightenment/applications");
ic = e_icon_add(evas);
e_util_icon_theme_set(ic, "preferences-applications");
e_widget_ilist_header_append(cfdata->list, ic, _("Applications"));
for (l = ll; l; l = l->next)
@ -177,8 +177,8 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
e_widget_ilist_append(cfdata->list, NULL, rem->role, NULL, rem, NULL);
}
ic = edje_object_add(evas);
e_util_edje_icon_set(ic, "enlightenment/e");
ic = e_icon_add(evas);
e_util_icon_theme_set(ic, "enlightenment");
e_widget_ilist_header_append(cfdata->list, ic, _("Enlightenment"));
for (l = ll; l; l = l->next)
{

2
src/modules/conf_winlist/e_int_config_winlist.c
View File

@ -54,7 +54,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Window List Settings"),
"E", "_config_winlist_dialog",
"enlightenment/winlist", 0, v, NULL);
"preferences-winlist", 0, v, NULL);
return cfd;
}

2
src/modules/conf_winlist/e_mod_main.c
View File

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
e_configure_registry_item_add("windows/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist);
e_configure_registry_item_add("windows/window_list", 30, _("Window List"), NULL, "preferences-winlist", e_int_config_winlist);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

6
src/modules/cpufreq/e_mod_main.c
View File

@ -382,7 +382,7 @@ _cpufreq_set_governor(const char *governor)
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
if (!dia) return;
e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
e_dialog_icon_set(dia, "enlightenment/e", 64);
e_dialog_icon_set(dia, "enlightenment", 64);
e_dialog_text_set(dia, _("There was an error trying to set the<br>"
"cpu frequency governor via the module's<br>"
"setfreq utility."));
@ -408,7 +408,7 @@ _cpufreq_set_frequency(int frequency)
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
if (!dia) return;
e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
e_dialog_icon_set(dia, "enlightenment/e", 64);
e_dialog_icon_set(dia, "enlightenment", 64);
e_dialog_text_set(dia, _("Your kernel does not support setting the<br>"
"CPU frequency at all. You may be missing<br>"
"Kernel modules or features, or your CPU<br>"
@ -428,7 +428,7 @@ _cpufreq_set_frequency(int frequency)
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
if (!dia) return;
e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
e_dialog_icon_set(dia, "enlightenment/e", 64);
e_dialog_icon_set(dia, "enlightenment", 64);
e_dialog_text_set(dia, _("There was an error trying to set the<br>"
"cpu frequency setting via the module's<br>"
"setfreq utility."));

2
src/modules/dropshadow/e_mod_main.c
View File

@ -86,7 +86,7 @@ e_modapi_init(E_Module *m)
ds = _ds_init(m);
snprintf(buf, sizeof(buf), "%s/e-module-dropshadow.edj", e_module_dir_get(m));
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/dropshadow", 150, _("Dropshadow"), NULL, buf, e_int_config_dropshadow_module);
dropshadow_mod = m;

2
src/modules/fileman/e_fwin.c
View File

@ -1601,7 +1601,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
e_widget_min_size_get(ot, &mw, &mh);
e_dialog_content_set(dia, ot, mw, mh);
e_dialog_show(dia);
e_dialog_border_icon_set(dia, "enlightenment/applications");
e_dialog_border_icon_set(dia, "preferences-applications");
}
static void

4
src/modules/gadman/e_mod_gadman.c
View File

@ -699,7 +699,7 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Appearance"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
e_menu_item_submenu_set(mi, mn);
e_object_del(E_OBJECT(mn));
@ -727,7 +727,7 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Behavior"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
e_menu_item_submenu_set(mi, mn);
e_object_del(E_OBJECT(mn));

2
src/modules/gadman/e_mod_main.c
View File

@ -23,7 +23,7 @@ e_modapi_init(E_Module *m)
/* Set up a new configuration panel */
snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", m->dir);
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
"enlightenment/extensions");
"preferences-extensions");
e_configure_registry_item_add("extensions/gadman", 150, _("Gadgets"), NULL,
buf, _config_gadman_module);

2
src/modules/ibar/e_mod_config.c
View File

@ -164,7 +164,7 @@ _cb_add(void *data, void *data2)
E_Config_Dialog_Data *cfdata;
cfdata = data;
e_entry_dialog_show(_("Create new IBar source"), "enlightenment/e",
e_entry_dialog_show(_("Create new IBar source"), "enlightenment",
_("Enter a name for this new source:"), "", NULL, NULL,
_cb_entry_ok, NULL, cfdata);
}

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

@ -1080,7 +1080,7 @@ static void
_mixer_configure_registry_register(void)
{
e_configure_registry_category_add(_reg_cat, 90, _("Extensions"), NULL,
"enlightenment/extensions");
"preferences-extensions");
e_configure_registry_item_add(_reg_item, 30, _(_Name), NULL,
"preferences-desktop-mixer",
_mixer_module_config);

2
src/modules/pager/e_mod_main.c
View File

@ -2795,7 +2795,7 @@ e_modapi_init(E_Module *m)
e_gadcon_provider_register(&_gadcon_class);
e_configure_registry_item_add("extensions/pager", 40, N_("Pager"), NULL,
"enlightenment/pager", _pager_config_dialog);
"preferences-pager", _pager_config_dialog);
act_popup_show = e_action_add("pager_show");
if (act_popup_show)

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

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