From 0e70e6e0aeac5e7fe75bc6fa6b5af0f7ffed88cc Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 11 Jan 2013 08:23:41 +0000 Subject: [PATCH] move comp icon to core SVN revision: 82619 --- data/themes/edc/icons.edc | 1 + data/themes/img/icon_preferences-composite.png | Bin 0 -> 1396 bytes src/modules/Makefile_conf_comp.am | 3 +-- src/modules/conf_comp/e-module-comp.edj | Bin 13048 -> 0 bytes src/modules/conf_comp/e_mod_config.c | 5 +---- src/modules/conf_comp/e_mod_main.c | 8 ++------ 6 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 data/themes/img/icon_preferences-composite.png delete mode 100644 src/modules/conf_comp/e-module-comp.edj diff --git a/data/themes/edc/icons.edc b/data/themes/edc/icons.edc index f02cc2759..5ad225a26 100644 --- a/data/themes/edc/icons.edc +++ b/data/themes/edc/icons.edc @@ -32,6 +32,7 @@ ICON("preferences-desktop-signal-bindings", 80, "icon_preferences-desktop-signal-bindings.png") ICON("preferences-variables", 80, "icon_preferences-variables.png") ICON("preferences-interaction", 80, "icon_preferences-interaction.png") + ICON("preferences-composite", 80, "icon_preferences-composite.png") ICON("enlightenment/wallpaper_stretch", 80, "icon_wallpaper_stretch.png") ICON("enlightenment/wallpaper_center", 80, "icon_wallpaper_center.png") diff --git a/data/themes/img/icon_preferences-composite.png b/data/themes/img/icon_preferences-composite.png new file mode 100644 index 0000000000000000000000000000000000000000..b6497df6bd5a9d70a0e18fc554e69090b33fa92a GIT binary patch literal 1396 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 diff --git a/src/modules/conf_comp/e_mod_config.c b/src/modules/conf_comp/e_mod_config.c index 56bed0753..fbde3b998 100644 --- a/src/modules/conf_comp/e_mod_config.c +++ b/src/modules/conf_comp/e_mod_config.c @@ -95,7 +95,6 @@ e_int_config_comp_module(E_Container *con, { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - char buf[4096]; Mod *mod = _comp_mod; if (e_config_dialog_find("E", "appearance/comp")) return NULL; @@ -108,10 +107,8 @@ e_int_config_comp_module(E_Container *con, v->advanced.apply_cfdata = _advanced_apply_data; v->advanced.create_widgets = _advanced_create_widgets; - snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", - e_module_dir_get(mod->module)); cfd = e_config_dialog_new(con, _("Composite Settings"), - "E", "appearance/comp", buf, 0, v, mod); + "E", "appearance/comp", "preferences-composite", 0, v, mod); mod->config_dialog = cfd; return cfd; } diff --git a/src/modules/conf_comp/e_mod_main.c b/src/modules/conf_comp/e_mod_main.c index 35b50aa8d..affa2296b 100644 --- a/src/modules/conf_comp/e_mod_main.c +++ b/src/modules/conf_comp/e_mod_main.c @@ -27,12 +27,10 @@ static void _e_mod_config_menu_create(void *d EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; - char buf[4096]; mi = e_menu_item_new(m); - snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", e_module_dir_get(_comp_mod->module)); e_menu_item_label_set(mi, _("Composite")); - e_menu_item_icon_file_set(mi, buf); + e_util_menu_item_theme_icon_set(mi, "preferences-composite"); e_menu_item_callback_set(mi, _e_mod_comp_conf_cb, NULL); } @@ -40,7 +38,6 @@ EAPI void * e_modapi_init(E_Module *m) { Mod *mod; - char buf[4096]; E_Comp_Config *conf; conf = e_comp_config_get(); @@ -54,11 +51,10 @@ e_modapi_init(E_Module *m) m->data = mod; mod->module = m; - snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", e_module_dir_get(m)); e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look"); e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL, - buf, e_int_config_comp_module); + "preferences-composite", e_int_config_comp_module); mod->conf = conf; maug = e_int_menus_menu_augmentation_add_sorted("config/1", _("Composite"), _e_mod_config_menu_create, NULL, NULL, NULL);