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

more icons renamed 

SVN revision: 39396
This commit is contained in:
Davide Andreoli 2009-03-06 19:17:12 +00:00
parent d04c871b0d
commit 1101c58d9f
22 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
data/themes/default.edc
View File

@ -16509,7 +16509,7 @@ collections { /* begin the collection of edje groups that are in this file */
part { name: "e.swallow.icon";
type: SWALLOW;
description {
state: "default" 0.0;
state: "default" 0.0;color: 255 0 0 200;
align: 0.0 0.5;
fixed: 1 0;
rel1 {
@ -22645,28 +22645,37 @@ group { name: "e/icons/"NAME ; \
#define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE)
// FreeDesktop.Org Icons (Note: in the comment the old e icon name)
/* FreeDesktop.Org Icons (Note: in the comment the old e icon name) */
//Standard Action Icons
ICON("help-about","logo_black_128.png",64) // "enlightenment/about"
ICON("list-add","icon_add.png",64)
ICON("list-remove","icon_del.png",64)
ICON("preferences-desktop","icon_config.png",64)
ICON("preferences-desktop","icon_desktops.png",64)
ICON("list-add","icon_add.png",64) // "widget/add"
ICON("list-remove","icon_del.png",64) // "widget/del"
ICON("system-run","icon_run.png",64) // "enlightenment/run"
//Standard Status Icons
ICON("dialog-warning","icon_warning.png",128) // "enlightenment/warning"
//Standard Application Icons
ICON("preferences-desktop","icon_desktops.png",64) // "enlightenment/desktops"
ICON("preferences-desktop-theme","icon_theme.png",64) // "enlightenment/themes"
ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64) // "enlightenment/background"
ICON("preferences-plugin","icon_modules.png",64) // "enlightenment/modules"
ICON("preferences-system","icon_configuration.png",64) // "enlightenment/configuration"
ICON("preferences-system-windows","icon_windows.png",64) // "enlightenment/windows"
ICON("system-file-manager","icon_efm_folder.png",64)
ICON("system-run","icon_run.png",64) // "enlightenment/run"
ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman"
//Standard Place Icons
ICON("user-home","icon_efm_home.png",64)
ICON("user-desktop","icon_efm_desktop.png",64)
ICON("user-bookmarks","icon_favorites.png",64)
ICON("computer","icon_efm_root.png", 64)
ICON("folder","icon_efm_folder.png",64)
//Standard Device Icons
ICON("computer","icon_efm_root.png", 64)
ICONMIME("inode/chardevice","icon_efm_file.png",128)
ICONMIME("inode/blockdevice","icon_efm_file.png",128)
@ -22680,9 +22689,9 @@ ICONMIME("inode/socket","icon_efm_file.png",128)
ICON("enlightenment/check","icon_check.png",64)
ICON("widget/swap","icon_swap.png",64)
ICON("widget/del","icon_del.png",64)
//ICON("widget/del","icon_del.png",64)
ICON("widget/new","icon_new.png",64)
ICON("widget/add","icon_add.png",64)
//ICON("widget/add","icon_add.png",64)
ICON("widget/add_fav","icon_add_fav.png",64)
ICON("widget/up_arrow","icon_up_arrow.png",64)
ICON("widget/down_arrow","icon_down_arrow.png",64)
@ -22696,7 +22705,7 @@ ICON("widget/reset","icon_reset.png",64)
/// Normal Icons ///
ICON("enlightenment/warning", "icon_warning.png",128)
//ICON("enlightenment/warning", "icon_warning.png",128)
ICON("enlightenment/website","icon_globe.png",64)
ICON("enlightenment/background","icon_wallpaper.png",64) //Done but some ref still around.....
ICON("enlightenment/picture","icon_wallpaper.png",64)
@ -22720,7 +22729,7 @@ ICON("enlightenment/window_remembers","icon_window_remembers.png",64)
ICON("enlightenment/focus","icon_window_focus.png",64)
//ICON("enlightenment/modules","icon_modules.png",64)
ICON("enlightenment/favorites","icon_favorites.png",64)
ICON("enlightenment/desktops","icon_desktops.png",64)
//ICON("enlightenment/desktops","icon_desktops.png",64)
//ICON("enlightenment/configuration","icon_configuration.png",64)
ICON("enlightenment/settings","icon_configuration.png",64)
ICON("enlightenment/engine","icon_engine.png",64)
@ -22731,7 +22740,7 @@ ICON("enlightenment/imc","icon_imc.png",64)
ICON("enlightenment/system","icon_system.png",64)
//ICON("enlightenment/run","icon_run.png",64)
ICON("enlightenment/directories","icon_directories.png",64)
ICON("enlightenment/fileman","icon_efm_folder.png",64)
//ICON("enlightenment/fileman","icon_efm_folder.png",64)
ICON("enlightenment/unknown","icon_dummy.png",64)
ICON("enlightenment/mouse","icon_mouse.png",64)
ICON("enlightenment/mouse_left","icon_mouse_left.png",64)

6
src/bin/e_dialog.c
View File

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

2
src/bin/e_gadcon.c
View File

@ -1297,7 +1297,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Remove this gadget"));
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "list-remove");
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc);
}
if (gcc->gadcon->menu_attach.func)

6
src/bin/e_int_config_modules.c
View File

@ -40,7 +40,7 @@ const CFTypes _types[] =
{
{"appearance", N_("Appearance"), "enlightenment/appearance"},
{"config", N_("Settings"), "preferences-system"},
{"fileman", N_("File Manager"), "enlightenment/fileman"},
{"fileman", N_("File Manager"), "system-file-manager"},
{"shelf", N_("Shelf"), "enlightenment/shelf"},
{"system", N_("System"), "enlightenment/system"},
{NULL, NULL, NULL}
@ -185,7 +185,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_on_change_hook_set(ol, _avail_list_cb_change, cfdata);
_fill_list(ol, 0);
e_widget_frametable_object_append(of, ol, 0, 0, 1, 1, 1, 1, 1, 1);
ol = e_widget_button_add(evas, _("Load Module"), "widget/add",
ol = e_widget_button_add(evas, _("Load Module"), "list-add",
_btn_cb_load, cfdata, NULL);
cfdata->b_load = ol;
e_widget_disabled_set(ol, 1);
@ -199,7 +199,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_on_change_hook_set(ol, _load_list_cb_change, cfdata);
_fill_list(ol, 1);
e_widget_frametable_object_append(of, ol, 0, 0, 1, 1, 1, 1, 1, 1);
ol = e_widget_button_add(evas, _("Unload Module"), "widget/del",
ol = e_widget_button_add(evas, _("Unload Module"), "list-remove",
_btn_cb_unload, cfdata, NULL);
cfdata->b_unload = ol;
e_widget_disabled_set(ol, 1);

4
src/bin/e_int_menus.c
View File

@ -254,7 +254,7 @@ e_int_menus_desktops_new(void)
subm = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Virtual"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/desktops");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
e_menu_pre_activate_callback_set(subm, _e_int_menus_virtuals_pre_cb, NULL);
e_menu_item_submenu_set(mi, subm);
@ -953,7 +953,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
if (subm && mi) e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, bd->desk->name);
e_util_menu_item_theme_icon_set(mi, "enlightenment/desktops");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
subm = e_menu_new();
}
else

2
src/bin/e_shelf.c
View File

@ -1635,6 +1635,6 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Delete this Shelf"));
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "list-remove");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_delete, es);
}

4
src/bin/e_widget_config_list.c
View File

@ -60,13 +60,13 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
e_widget_min_size_set(o, 100, 25);
e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 0, 1, 0);
o = e_widget_button_add(evas, _("Add"), "widget/add", _button_cb_add,
o = e_widget_button_add(evas, _("Add"), "list-add", _button_cb_add,
wd, obj);
wd->gui.add = o;
e_widget_disabled_set(o, 1);
e_widget_table_object_append(wd->gui.table, o, 0, 3, 1, 1, 1, 0, 1, 0);
o = e_widget_button_add(evas, _("Remove"), "widget/del",
o = e_widget_button_add(evas, _("Remove"), "list-remove",
_button_cb_remove, wd, obj);
wd->gui.remove = o;
e_widget_disabled_set(o, 1);

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

@ -244,7 +244,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
cfdata->o_all = ow;
_fill_apps(cfdata);
e_widget_frametable_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 1, 1);
ow = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add,
ow = e_widget_button_add(evas, _("Add"), "list-add", _cb_add,
cfdata, NULL);
cfdata->o_add = ow;
e_widget_disabled_set(ow, 1);
@ -270,7 +270,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_disabled_set(ow, 1);
e_widget_table_object_append(bt, ow, 1, 0, 1, 1, 1, 0, 1, 0);
e_widget_frametable_object_append(ot, bt, 0, 1, 1, 1, 1, 0, 1, 0);
ow = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del,
ow = e_widget_button_add(evas, _("Delete"), "list-remove", _cb_del,
cfdata, NULL);
cfdata->o_del = ow;
e_widget_disabled_set(ow, 1);

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

@ -50,7 +50,7 @@ e_int_config_desk(E_Container *con, const char *params)
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "_config_desk_dialog",
"enlightenment/desktops", 0, v, cfdata);
"preferences-desktop", 0, v, cfdata);
return cfd;
}

2
src/modules/conf_desks/e_int_config_desks.c
View File

@ -53,7 +53,7 @@ e_int_config_desks(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Virtual Desktops Settings"),
"E", "_config_desks_dialog",
"enlightenment/desktops", 0, v, NULL);
"preferences-desktop", 0, v, NULL);
return cfd;
}

2
src/modules/conf_desks/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, "enlightenment/screen_setup");
e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "enlightenment/desktops", e_int_config_desks);
e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "preferences-desktop", e_int_config_desks);
conf_module = m;
e_module_delayed_set(m, 1);
return m;

2
src/modules/conf_mime/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("fileman", 100, _("Files"), NULL, "enlightenment/fileman");
e_configure_registry_category_add("fileman", 100, _("Files"), NULL, "system-file-manager");
e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), NULL, "enlightenment/file_icons", e_int_config_mime);
conf_module = m;
e_module_delayed_set(m, 1);

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

@ -119,9 +119,9 @@ _create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
cfdata->o_text = ob;
ot = e_widget_table_add(evas, 0);
ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata, NULL);
ob = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 0, 0);
cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_delete, cfdata, NULL);
cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "list-remove", _cb_delete, cfdata, NULL);
e_widget_table_object_append(ot, cfdata->o_delete, 1, 0, 1, 1, 1, 1, 0, 0);
cfdata->o_reset = e_widget_button_add(evas, _("Reset"), "widget/reset", _cb_reset, cfdata, NULL);
e_widget_table_object_align_append(ot, cfdata->o_reset, 2, 0, 1, 1, 0, 1, 1, 1, 1.0, 0.5);
@ -287,7 +287,7 @@ _cb_delete(void *data, void *data2)
d->cfdata->sel_profile);
e_confirm_dialog_show
(_("Delete OK?"),
"enlightenment/warning", buf, NULL, NULL, _cb_dialog_yes, NULL, d, NULL,
"dialog-warning", buf, NULL, NULL, _cb_dialog_yes, NULL, d, NULL,
_cb_dialog_destroy, d);
}

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

@ -76,9 +76,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_list_object_append(o, of, 1, 1, 0.5);
ot = e_widget_table_add(evas, 0);
ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata, NULL);
ob = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 0, 0);
cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "widget/del",
cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "list-remove",
_cb_delete, cfdata, NULL);
e_widget_table_object_append(ot, cfdata->o_delete, 0, 1, 1, 1, 1, 1, 0, 0);
cfdata->o_config = e_widget_button_add(evas, _("Configure"), "widget/config",

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

@ -92,7 +92,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
o = e_widget_list_add(evas, 0, 0);
of = e_widget_frametable_add(evas, _("Window Remembers"), 0);
ow = e_widget_button_add(evas, _("Delete Remember(s)"), "widget/del",
ow = e_widget_button_add(evas, _("Delete Remember(s)"), "list-remove",
_cb_delete, cfdata, NULL);
cfdata->btn = ow;

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

@ -421,7 +421,7 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
if (fwin->win->border->internal_icon)
eina_stringshare_del(fwin->win->border->internal_icon);
fwin->win->border->internal_icon =
eina_stringshare_add("enlightenment/fileman");
eina_stringshare_add("system-file-manager");
}
return fwin;

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

@ -87,7 +87,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("Fileman Settings"), "E",
"_config_fileman_dialog",
"enlightenment/fileman", 0, v, NULL);
"system-file-manager", 0, v, NULL);
return cfd;
}

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

@ -47,9 +47,9 @@ e_modapi_init(E_Module *m)
/* Setup Entry in Config Panel */
e_configure_registry_category_add("fileman", 100, _("Files"),
NULL, "enlightenment/fileman");
NULL, "system-file-manager");
e_configure_registry_item_add("fileman/fileman", 10, _("File Manager"),
NULL, "enlightenment/fileman",
NULL, "system-file-manager",
e_int_config_fileman);
/* Setup Config edd */

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

@ -740,13 +740,13 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
/* Remove this gadgets */
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Remove this gadget"));
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "list-remove");
e_menu_item_callback_set(mi, on_menu_delete, gcc);
/* Add other gadgets */
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Add other gadgets"));
e_util_menu_item_theme_icon_set(mi, "widget/add");
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, on_menu_add, gcc);
}

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

@ -106,9 +106,9 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_frametable_object_append(of, ol, 0, 0, 1, 2, 1, 1, 1, 0);
ot = e_widget_table_add(evas, 0);
ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata, NULL);
ob = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 1, 0);
ob = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del, cfdata, NULL);
ob = e_widget_button_add(evas, _("Delete"), "list-remove", _cb_del, cfdata, NULL);
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 1, 1, 0);
ob = e_widget_button_add(evas, _("Configure"), "widget/config", _cb_config, cfdata, NULL);
e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 1, 1, 0);

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

@ -805,7 +805,7 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Remove Icon"));
e_util_menu_item_theme_icon_set(mi, "widget/del");
e_util_menu_item_theme_icon_set(mi, "list-remove");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_remove, ic);
mi = e_menu_item_new(mn);
@ -815,7 +815,7 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Add An Icon"));
e_util_menu_item_theme_icon_set(mi, "widget/add");
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_add, NULL);
}
if (e_configure_registry_exists("applications/new_application"))
@ -838,7 +838,7 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Add Application"));
e_util_menu_item_theme_icon_set(mi, "widget/add");
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _ibar_cb_menu_add, ic->ibar);
}

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

@ -809,7 +809,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Virtual Desktops Settings"));
e_util_menu_item_theme_icon_set(mi, "enlightenment/desktops");
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst);
}