rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=9d5e2cbb21696e1443530fbfdc1240dc6cc30989
commit 9d5e2cbb21696e1443530fbfdc1240dc6cc30989 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Thu Jul 9 11:21:12 2015 +0300 remove GET_STYL macro --- src/bin/common/common_macro.h | 34 --------------------------------- src/bin/ui/connector.c | 10 +++------- src/bin/ui/editors/colorclass_manager.c | 9 +++------ src/bin/ui/editors/image_editor.c | 17 +++++------------ 4 files changed, 11 insertions(+), 59 deletions(-) diff --git a/src/bin/common/common_macro.h b/src/bin/common/common_macro.h index 055abdb..f851160 100644 --- a/src/bin/common/common_macro.h +++ b/src/bin/common/common_macro.h @@ -77,40 +77,6 @@ struct _Uns_List elm_object_text_set(lb, date); \ } -#define GET_STYLE(PROJECT, STYLE) \ - Eina_Inlist *_styles, *_classes, *_widgets = NULL; \ - Widget *_widget; \ - Class *_class; \ - Style *_style; \ - if (PROJECT->current_style) STYLE = PROJECT->current_style; \ - else \ - { \ - _widgets = PROJECT->widgets; \ - if (!_widgets) STYLE = NULL; \ - else\ - { \ - _widget = EINA_INLIST_CONTAINER_GET(_widgets, Widget); \ - _classes = _widget->classes; \ - if (!_classes) STYLE = NULL; \ - else \ - { \ - _class = EINA_INLIST_CONTAINER_GET(_classes, Class); \ - _styles = _class->styles; \ - if (!_styles) STYLE = NULL; \ - else \ - { \ - _style = EINA_INLIST_CONTAINER_GET(_styles, Style); \ - STYLE = _style; \ - } \ - } \ - } \ - if ((!STYLE) && (PROJECT->layouts)) \ - { \ - _style = EINA_INLIST_CONTAINER_GET(PROJECT->layouts, Style); \ - STYLE = _style;\ - } \ - } - #define ITEM_SEARCH_FUNC(_gen, _GEN_SCROLL, PART_NAME) \ static void \ _##_gen##_item_search(Evas_Object *obj, \ diff --git a/src/bin/ui/connector.c b/src/bin/ui/connector.c index a3d5e14..ca34273 100644 --- a/src/bin/ui/connector.c +++ b/src/bin/ui/connector.c @@ -370,7 +370,7 @@ _add_layout_cb(void *data, App_Data *ap = app_data_get(); Style *layout = NULL; Eina_Stringshare *name = NULL; - Evas_Object *group_obj, *en; + Evas_Object *en; widget_list = _widgetlist_current_genlist_get(ap, LAYOUT); en = (Evas_Object *)data; @@ -380,12 +380,8 @@ _add_layout_cb(void *data, NOTIFY_WARNING(_("Please type layout name")); goto exit; } - GET_STYLE(ap->project, layout); - /* Using aliased group, if the group we've found is alias. */ - group_obj = (layout->isAlias) ? layout->main_group->obj : layout->obj; - - if (edje_edit_group_exist(group_obj, name)) + if (edje_edit_group_exist(ap->project->global_object, name)) { NOTIFY_INFO(3, _("Failed to create new layout.")); ERR("Failed to create new layout: all avalaible names are existing"); @@ -393,7 +389,7 @@ _add_layout_cb(void *data, return; } - if (!edje_edit_group_add(group_obj, name)) + if (!edje_edit_group_add(ap->project->global_object, name)) { NOTIFY_INFO(3, _("Failed to create new layout.")); ERR("Failed to create new layout: edje edit group add is failed"); diff --git a/src/bin/ui/editors/colorclass_manager.c b/src/bin/ui/editors/colorclass_manager.c index df9a333..b0a06c2 100644 --- a/src/bin/ui/editors/colorclass_manager.c +++ b/src/bin/ui/editors/colorclass_manager.c @@ -412,19 +412,16 @@ _on_btn_apply(void *data, Uns_List *it = NULL; Colorclass_Item *ccl_it = NULL; - Style *style = NULL; - GET_STYLE(edit->pr, style); - EINA_LIST_FOREACH(edit->unapplied_list, l, it) { ccl_it = (Colorclass_Item *)it->data; if (it->act_type == ACTION_TYPE_DEL) - edje_edit_color_class_del(style->obj, ccl_it->name); + edje_edit_color_class_del(edit->pr->global_object, ccl_it->name); else { - edje_edit_color_class_add(style->obj, eina_stringshare_add(ccl_it->name)); - edje_edit_color_class_colors_set(style->obj, ccl_it->name, + edje_edit_color_class_add(edit->pr->global_object, eina_stringshare_add(ccl_it->name)); + edje_edit_color_class_colors_set(edit->pr->global_object, ccl_it->name, ccl_it->r1, ccl_it->g1, ccl_it->b1, ccl_it->a1, ccl_it->r2, ccl_it->g2, diff --git a/src/bin/ui/editors/image_editor.c b/src/bin/ui/editors/image_editor.c index b4012ff..713830a 100644 --- a/src/bin/ui/editors/image_editor.c +++ b/src/bin/ui/editors/image_editor.c @@ -596,7 +596,6 @@ _on_image_done(void *data, Elm_Object_Item *item = NULL; const Eina_List *images, *l; const char *selected = event_info; - Style *style = NULL; Uns_List *image = NULL; Image_Editor *img_edit = (Image_Editor *)data; @@ -604,7 +603,6 @@ _on_image_done(void *data, if ((!selected) || (!strcmp(selected, ""))) goto del; - GET_STYLE(img_edit->pr, style); images = elm_fileselector_selected_paths_get(obj); EINA_LIST_FOREACH(images, l, selected) @@ -695,7 +693,6 @@ _on_button_delete_clicked_cb(void *data, Eina_List * in_use = NULL, *used_in = NULL; char *name; Edje_Part_Image_Use *item; - Style *style = NULL; char buf[BUFF_MAX]; int symbs = 0; Uns_List *image = NULL; @@ -703,15 +700,13 @@ _on_button_delete_clicked_cb(void *data, if (!img_edit->gengrid) return; - GET_STYLE(img_edit->pr, style); - grid_list = (Eina_List *)elm_gengrid_selected_items_get(img_edit->gengrid); if (!grid_list) return; EINA_LIST_FOREACH_SAFE(grid_list, l, l2, grid_item) { it = elm_object_item_data_get(grid_item); - used = edje_edit_image_usage_list_get(style->obj, it->image_name, EINA_TRUE); + used = edje_edit_image_usage_list_get(img_edit->pr->global_object, it->image_name, EINA_TRUE); if (!used) { elm_object_item_del(grid_item); @@ -733,7 +728,7 @@ _on_button_delete_clicked_cb(void *data, if (notdeleted == 1) { name = eina_list_nth(in_use, 0); - used_in = edje_edit_image_usage_list_get(style->obj, name, false); + used_in = edje_edit_image_usage_list_get(img_edit->pr->global_object, name, false); snprintf(buf, BUFF_MAX, _("Image is used in:")); symbs = strlen(buf); EINA_LIST_FOREACH(used_in, l, item) @@ -783,8 +778,6 @@ _on_button_apply_clicked_cb(void *data, Image_Editor *img_edit = (Image_Editor *)data; Uns_List *unit = NULL; App_Data *ap = app_data_get(); - Style *style = NULL; - GET_STYLE(img_edit->pr, style); Eina_List *l, *names = NULL; Eina_Bool multiselect = false; const Eina_List *items; @@ -796,13 +789,13 @@ _on_button_apply_clicked_cb(void *data, { if (unit->act_type == ACTION_TYPE_DEL) { - if (edje_edit_image_del(style->obj, unit->data)) + if (edje_edit_image_del(img_edit->pr->global_object, unit->data)) ap->project->nsimage_list = eina_list_append(ap->project->nsimage_list, unit); } - else if (edje_edit_image_add(style->obj, unit->data)) + else if (edje_edit_image_add(img_edit->pr->global_object, unit->data)) ap->project->nsimage_list = eina_list_append(ap->project->nsimage_list, unit); } - pm_save_to_dev(img_edit->pr, style, false); + pm_save_to_dev(img_edit->pr, NULL, false); eina_list_free(img_edit->unapplied_list); --