enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

More icon renamed, for more info look at default.edc (around line 22650). I'm keeping there a mapping between e old names and fdo ones. 

SVN revision: 39374
This commit is contained in:
Davide Andreoli 2009-03-05 02:39:50 +00:00
parent 2904ca6d46
commit fc66fc7c73
29 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
data/themes/default.edc
View File

@ -22645,20 +22645,21 @@ group { name: "e/icons/"NAME ; \
#define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE)
// FreeDesktop.Org Icons //
// FreeDesktop.Org Icons (Note: in the comment the old e icon name)
ICON("help-about","logo_black_128.png",64)
ICON("help-about","logo_black_128.png",64) // "enlightenment/about"
ICON("list-add","icon_add.png",64)
ICON("list-remove","icon_del.png",64)
ICON("preferences-desktop","icon_config.png",64)
ICON("preferences-desktop","icon_desktops.png",64)
ICON("preferences-desktop-theme","icon_theme.png",64)
ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64)
ICON("preferences-plugin","icon_modules.png",64)
ICON("preferences-system","icon_configuration.png",64)
ICON("preferences-system-windows","icon_windows.png",64)
ICON("preferences-desktop-theme","icon_theme.png",64) // "enlightenment/themes"
ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64) // "enlightenment/background"
ICON("preferences-plugin","icon_modules.png",64) // "enlightenment/modules"
ICON("preferences-system","icon_configuration.png",64) // "enlightenment/configuration"
ICON("preferences-system-windows","icon_windows.png",64) // "enlightenment/windows"
ICON("system-file-manager","icon_efm_folder.png",64)
ICON("system-run","icon_run.png",64)
ICON("system-run","icon_run.png",64) // "enlightenment/run"
ICON("user-home","icon_efm_home.png",64)
ICON("user-desktop","icon_efm_desktop.png",64)
@ -22697,7 +22698,7 @@ ICON("widget/reset","icon_reset.png",64)
ICON("enlightenment/warning", "icon_warning.png",128)
ICON("enlightenment/website","icon_globe.png",64)
ICON("enlightenment/background","icon_wallpaper.png",64)
ICON("enlightenment/background","icon_wallpaper.png",64) //Done but some ref still around.....
ICON("enlightenment/picture","icon_wallpaper.png",64)
ICON("enlightenment/gradient","icon_gradient.png",64)
ICON("enlightenment/e","logo_white_128.png",64)
@ -22710,17 +22711,17 @@ 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) TODO some still around.....
ICON("enlightenment/themes","icon_theme.png",64) //Done but some ref still around.....
ICON("enlightenment/screen_setup","icon_screen_setup.png",64)
ICON("enlightenment/windows","icon_windows.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/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/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)
@ -22728,7 +22729,7 @@ 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/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)

2
src/bin/e_bg.c
View File

@ -19,7 +19,7 @@ e_bg_init(void)
/* Register mime handler */
bg_hdl = e_fm2_mime_handler_new(_("Set As Background"),
"enlightenment/background",
"preferences-desktop-wallpaper",
e_bg_handler_set, NULL,
e_bg_handler_test, NULL);
if (bg_hdl) e_fm2_mime_handler_glob_add(bg_hdl, "*.edj");

2
src/bin/e_configure.c
View File

@ -13,7 +13,7 @@ EAPI void
e_configure_init(void)
{
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "enlightenment/modules", e_int_config_modules);
e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "preferences-plugin", e_int_config_modules);
handlers = eina_list_append
(handlers, ecore_event_handler_add

5
src/bin/e_dialog.c
View File

@ -157,8 +157,9 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
if (!icon) return;
dia->icon_object = edje_object_add(e_win_evas_get(dia->win));
e_util_edje_icon_set(dia->icon_object, icon);
edje_extern_object_min_size_set(dia->icon_object, size, size);
dia->icon_object = e_icon_add(e_win_evas_get(dia->win));
e_util_icon_theme_set(dia->icon_object, icon);
//edje_extern_object_min_size_set(dia->icon_object, size, size);
edje_object_part_swallow(dia->bg_object, "e.swallow.icon", dia->icon_object);
evas_object_show(dia->icon_object);
}

4
src/bin/e_exec.c
View File

@ -595,7 +595,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_list_object_append(o, ob, 1, 1, 0.5);
}
ob = e_widget_button_add(evas, _("Save This Message"), "enlightenment/run",
ob = e_widget_button_add(evas, _("Save This Message"), "system-run",
_dialog_save_cb, NULL, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
@ -674,7 +674,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(o, ot, 1, 1, 0.5);
ob = e_widget_button_add(evas, _("Save This Message"), "enlightenment/run", _dialog_save_cb, NULL, cfdata);
ob = e_widget_button_add(evas, _("Save This Message"), "system-run", _dialog_save_cb, NULL, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
snprintf(buf, sizeof(buf), _("This error log will be saved as %s/%s.log"),

2
src/bin/e_int_border_prop.c
View File

@ -81,7 +81,7 @@ e_int_border_prop(E_Border *bd)
e_dialog_button_add(dia, _("Close"), NULL, _bd_cb_dialog_close, dia);
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
e_dialog_border_icon_set(dia, "enlightenment/windows");
e_dialog_border_icon_set(dia, "preferences-system-windows");
e_dialog_resizable_set(dia, 1);
}

8
src/bin/e_int_config_modules.c
View File

@ -39,7 +39,7 @@ struct _E_Config_Dialog_Data
const CFTypes _types[] =
{
{"appearance", N_("Appearance"), "enlightenment/appearance"},
{"config", N_("Settings"), "enlightenment/configuration"},
{"config", N_("Settings"), "preferences-system"},
{"fileman", N_("File Manager"), "enlightenment/fileman"},
{"shelf", N_("Shelf"), "enlightenment/shelf"},
{"system", N_("System"), "enlightenment/system"},
@ -119,7 +119,7 @@ e_int_config_modules(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con, _("Module Settings"),
"E", "_config_modules_dialog",
"enlightenment/modules", 0, v, NULL);
"preferences-plugin", 0, v, NULL);
e_dialog_resizable_set(cfd->dia, 1);
return cfd;
}
@ -396,8 +396,8 @@ _fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
/* We have at least one, append header */
if (cft->icon)
{
ic = edje_object_add(evas);
e_util_edje_icon_set(ic, cft->icon);
ic = e_icon_add(evas);
e_util_icon_theme_set(ic, cft->icon);
}
e_widget_ilist_header_append(obj, ic, cft->name);

4
src/bin/e_int_menus.c
View File

@ -873,7 +873,7 @@ _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m)
if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, bd->client.icccm.class);
e_util_menu_item_theme_icon_set(mi, "enlightenment/windows");
e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
subm = e_menu_new();
}
else
@ -1072,7 +1072,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Cleanup Windows"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/windows");
e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
e_menu_item_callback_set(mi, _e_int_menus_clients_cleanup_cb, zone);
if (dat)

2
src/bin/e_module.c
View File

@ -395,7 +395,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body)
if (desktop) efreet_desktop_free(desktop);
}
else
e_dialog_icon_set(dia, "enlightenment/modules", 64);
e_dialog_icon_set(dia, "preferences-plugin", 64);
e_dialog_text_set(dia, body);
e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);

2
src/bin/e_test.c
View File

@ -156,7 +156,7 @@ _e_test_internal(E_Container *con)
e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del);
e_dialog_title_set(dia, "A Test Dialog");
e_dialog_text_set(dia, "A Test Dialog<br>And another line<br><hilight>Hilighted Text</hilight>");
e_dialog_icon_set(dia, "enlightenment/modules", 64);
e_dialog_icon_set(dia, "preference-plugin", 64);
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
e_dialog_button_add(dia, "Apply", "enlightenment/reset", NULL, NULL);
e_dialog_button_add(dia, "Cancel", "enlightenment/exit", NULL, NULL);

11
src/modules/conf/e_conf.c
View File

@ -182,7 +182,7 @@ e_configure_show(E_Container *con)
evas_object_show(eco->edje);
e_win_show(eco->win);
e_win_border_icon_set(eco->win, "enlightenment/configuration");
e_win_border_icon_set(eco->win, "preferences-system");
/* Preselect "Appearance" */
e_widget_focus_set(eco->cat_list, 1);
@ -305,13 +305,12 @@ _e_configure_category_add(E_Configure *eco, const char *label, const char *icon)
cat->label = eina_stringshare_add(label);
if (icon)
{
if (e_util_edje_icon_check(icon))
o = e_icon_add(eco->evas);
if (!e_util_icon_theme_set(o, icon))
{
o = edje_object_add(eco->evas);
e_util_edje_icon_set(o, icon);
evas_object_del(o);
o = e_util_icon_add(icon, eco->evas);
}
else
o = e_util_icon_add(icon, eco->evas);
}
eco->cats = eina_list_append(eco->cats, cat);

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

@ -49,8 +49,8 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
Evas_Object *o;
E_Gadcon_Client *gcc;
o = edje_object_add(gc->evas);
e_util_edje_icon_set(o, "enlightenment/configuration");
o = e_icon_add(gc->evas);
e_util_icon_theme_set(o, "preferences-system");
evas_object_show(o);
gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = o;

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

@ -37,7 +37,7 @@ e_modapi_init(E_Module *m)
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("internal", -1, _("Internal"), NULL, "enlightenment/internal");
e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other);
e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "preferences-system-windows", e_int_config_apps_ibar_other);
e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
e_configure_registry_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "enlightenment/favorites", e_int_config_apps_favs);
conf_module = m;

4
src/modules/conf_borders/e_int_config_borders.c
View File

@ -29,7 +29,7 @@ e_int_config_borders(E_Container *con, const char *params __UNUSED__)
if (!v) return NULL;
cfd = e_config_dialog_new(con, _("Default Border Style"),
"E", "_config_border_style_dialog",
"enlightenment/windows", 0, v, con);
"preferences-system-windows", 0, v, con);
return cfd;
}
@ -49,7 +49,7 @@ e_int_config_borders_border(E_Container *con __UNUSED__, const char *params)
cfd = e_config_dialog_new(bd->zone->container,
_("Window Border Selection"),
"E", "_config_border_border_style_dialog",
"enlightenment/windows", 0, v, bd);
"preferences-system-windows", 0, v, bd);
bd->border_border_dialog = cfd;
return cfd;
}

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

@ -32,9 +32,9 @@ 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/borders", 50, _("Borders"), NULL, "enlightenment/windows", e_int_config_borders);
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, "enlightenment/windows", e_int_config_borders_border);
e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "preferences-system-windows", e_int_config_borders_border);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

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

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "preferences-system-windows", e_int_config_desk);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

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

@ -32,7 +32,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "enlightenment/settings");
e_configure_registry_item_add("settings/dialogs", 10, _("Dialogs"), NULL, "enlightenment/configuration", e_int_config_dialogs);
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);
return m;

2
src/modules/conf_exebuf/e_int_config_exebuf.c
View File

@ -45,7 +45,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Run Command Settings"),
"E", "_config_exebuf_dialog",
"enlightenment/run", 0, v, NULL);
"system-run", 0, v, NULL);
return cfd;
}

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

@ -32,7 +32,7 @@ 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/run_command", 40, _("Run Command"), NULL, "enlightenment/run", e_int_config_exebuf);
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);
return m;

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

@ -109,7 +109,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
cfd = e_config_dialog_new(con, _("Wallpaper Settings"), "E",
"_config_wallpaper_dialog",
"enlightenment/background", 0, v, cw);
"preferences-desktop-wallpaper", 0, v, cw);
return cfd;
}

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

@ -222,7 +222,7 @@ e_int_config_wallpaper_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/background");
e_win_border_icon_set(win, "preferences-desktop-wallpaper");
if (!e_widget_focus_get(import->bg_obj))
e_widget_focus_set(import->box_obj, 1);

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

@ -26,9 +26,9 @@ 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/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper);
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, "enlightenment/windows", e_int_config_wallpaper_desk);
e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL);
import_hdl = e_fm2_mime_handler_new(_("Set As Background"), "enlightenment/background",

2
src/modules/conf_window_display/e_int_config_window_display.c
View File

@ -53,7 +53,7 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Window Display"),
"E", "_config_window_display_dialog",
"enlightenment/windows", 0, v, NULL);
"preferences-system-windows", 0, v, NULL);
return cfd;
}

4
src/modules/conf_window_display/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("windows", 50, _("Windows"), NULL, "enlightenment/windows");
e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "enlightenment/windows", e_int_config_window_display);
e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "preferences-system-windows", e_int_config_window_display);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_window_focus/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("windows", 50, _("Windows"), NULL, "enlightenment/windows");
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);
conf_module = m;
e_module_delayed_set(m, 1);

2
src/modules/conf_window_manipulation/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("windows", 50, _("Windows"), NULL, "enlightenment/windows");
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);

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

@ -192,8 +192,8 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
e_widget_ilist_append(cfdata->list, NULL, rem->class, NULL, rem, NULL);
}
ic = edje_object_add(evas);
e_util_edje_icon_set(ic, "enlightenment/modules");
ic = e_icon_add(evas);
e_util_icon_theme_set(ic, "preferences-plugin");
e_widget_ilist_header_append(cfdata->list, ic, _("Modules"));
for (l = ll; l; l = l->next)
{

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

@ -12,7 +12,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("windows", 50, _("Windows"), NULL,
"enlightenment/windows");
"preferences-system-windows");
e_configure_registry_item_add("windows/window_remembers", 40,
_("Window Remembers"), NULL,
"enlightenment/window_remembers",

2
src/modules/conf_winlist/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("windows", 50, _("Windows"), NULL, "enlightenment/windows");
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);
conf_module = m;
e_module_delayed_set(m, 1);