jaehwan pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=3a4a7d5cba1f41f20e2a25f7ea0fded665148f85
commit 3a4a7d5cba1f41f20e2a25f7ea0fded665148f85 Author: Jaehwan Kim <[email protected]> Date: Wed Jul 20 20:26:29 2016 +0900 theme: set the edj file path dynamically. If it is re-located after compilation, the paths should be changed. --- configure.ac | 9 +-------- src/bin/common/widget_macro.h | 2 +- src/bin/eflete.c | 19 +++++++++++++++++-- src/bin/eflete.h | 6 ++++++ src/bin/external/syntax_color.c | 2 +- src/bin/project_manager/project_manager.c | 4 +++- src/bin/ui/colorclass_manager.c | 2 +- src/bin/ui/cursor.c | 2 +- src/bin/ui/editors/animator_program_editor.c | 2 +- src/bin/ui/image_manager.c | 10 ++++++---- src/bin/ui/menu.c | 5 ++++- src/bin/ui/popup.c | 2 +- src/bin/ui/preference/preference.c | 2 +- src/bin/ui/property/property_common.c | 6 +++--- src/bin/ui/property/property_group.c | 12 ++++++------ src/bin/ui/tab_home_import_edj.c | 6 ++++-- src/bin/ui/tab_home_new.c | 7 +++---- src/bin/ui/workspace/container.c | 8 ++++---- src/bin/ui/workspace/highlight.c | 4 ++-- 19 files changed, 66 insertions(+), 44 deletions(-) diff --git a/configure.ac b/configure.ac index 05dfad8..7aa2aad 100644 --- a/configure.ac +++ b/configure.ac @@ -205,14 +205,7 @@ AC_SUBST(LOCALE_DIR) DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo efl evas edje ecore elementary` AC_SUBST([DEPS_EOLIAN_FLAGS]) -EFLETE_DEFINE=" -DEFLETE_EDJ=\\\"${datadir}/eflete/layouts/eflete.edj\\\" " -EFLETE_DEFINE+=" -DEFLETE_THEME=\\\"${datadir}/eflete/themes/default/eflete_elm.edj\\\" " -EFLETE_DEFINE+=" -DEFLETE_EDJ_PATH=\\\"${datadir}/eflete/themes/default/\\\" " -EFLETE_DEFINE+=" -DEFLETE_IMG_PATH=\\\"${datadir}/eflete/images/\\\" " -EFLETE_DEFINE+=" -DEFLETE_TEMPLATE_EDJ_PATH=\\\"${datadir}/eflete/themes/default/template/edj\\\" " -EFLETE_DEFINE+=" -DEFLETE_TEMPLATE_EDC_PATH=\\\"${datadir}/eflete/themes/default/template/edc\\\" " -EFLETE_DEFINE+=" -DEFLETE_TEMPLATE_IMAGES_PATH=\\\"${datadir}/eflete/themes/default/template/images\\\" " -EFLETE_DEFINE+=" -DEFLETE_TEMPLATE_SOUNDS_PATH=\\\"${datadir}/eflete/themes/default/template/sounds\\\" " +EFLETE_DEFINE=" -DEFLETE_EDJ_PATH=\\\"${datadir}/eflete/themes/default/\\\" " AC_SUBST([EFLETE_DEFINE]) AM_PROG_CC_C_O diff --git a/src/bin/common/widget_macro.h b/src/bin/common/widget_macro.h index 5c121ce..5e1933c 100644 --- a/src/bin/common/widget_macro.h +++ b/src/bin/common/widget_macro.h @@ -122,7 +122,7 @@ TODO("see large comment below") #define IMAGE_ADD_NEW(PARENT, IMAGE, NAME, STYLE) \ IMAGE = elm_image_add(PARENT); \ - elm_image_file_set(IMAGE, EFLETE_THEME, "elm/image/"NAME"/"STYLE); + elm_image_file_set(IMAGE, ap.path.theme_edj, "elm/image/"NAME"/"STYLE); #define HOVERSEL_ADD(PARENT, HOVERSEL, ISHORIZONTAL) \ HOVERSEL = elm_hoversel_add(PARENT); \ diff --git a/src/bin/eflete.c b/src/bin/eflete.c index 3dfae53..f498195 100644 --- a/src/bin/eflete.c +++ b/src/bin/eflete.c @@ -93,12 +93,19 @@ app_init() CRIT("Can't initialize the Ewe library"); return false; } + elm_app_info_set(NULL, "eflete", NULL); + + ap.path.theme_edj = eina_stringshare_printf("%s/themes/default/eflete_elm.edj", elm_app_data_dir_get()); + ap.path.layout_edj = eina_stringshare_printf("%s/layouts/eflete.edj", elm_app_data_dir_get()); + ap.path.edj_path = eina_stringshare_printf("%s/themes/default/", elm_app_data_dir_get()); + ap.path.image_path = eina_stringshare_printf("%s/images/", elm_app_data_dir_get()); ap.theme = elm_theme_new(); + #ifndef _WIN32 - char *theme = strdup(EFLETE_THEME); + char *theme = strdup(ap.path.theme_edj); #else - char *theme = escape_colons(EFLETE_THEME); + char *theme = escape_colons(ap.path.theme_edj); #endif elm_theme_set(ap.theme, theme); free(theme); @@ -116,6 +123,14 @@ app_shutdown() { if (ap.last_path) eina_stringshare_del(ap.last_path); + if (ap.path.theme_edj) + eina_stringshare_del(ap.path.theme_edj); + if (ap.path.layout_edj) + eina_stringshare_del(ap.path.layout_edj); + if (ap.path.edj_path) + eina_stringshare_del(ap.path.edj_path); + if (ap.path.image_path) + eina_stringshare_del(ap.path.image_path); config_shutdown(); elm_theme_free(ap.theme); diff --git a/src/bin/eflete.h b/src/bin/eflete.h index 3eaf684..5516daf 100644 --- a/src/bin/eflete.h +++ b/src/bin/eflete.h @@ -123,6 +123,12 @@ struct _App_Data Evas_Object *history; Elm_Object_Item *item_history, *item_property; } block; + struct { + Eina_Stringshare *theme_edj; + Eina_Stringshare *layout_edj; + Eina_Stringshare *edj_path; + Eina_Stringshare *image_path; + } path; Project *project; Shortcut_Module *shortcuts; /**< Structure with data from shortcuts module */ #ifdef HAVE_ENVENTOR diff --git a/src/bin/external/syntax_color.c b/src/bin/external/syntax_color.c index 370e31f..77fca78 100644 --- a/src/bin/external/syntax_color.c +++ b/src/bin/external/syntax_color.c @@ -96,7 +96,7 @@ static void color_load(color_data *cd __UNUSED__) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), EFLETE_EDJ_PATH"color/color.eet"); + snprintf(buf, sizeof(buf), "%scolor/color.eet", ap.path.edj_path); Eet_File *ef = eet_open(buf, EET_FILE_MODE_READ); if (ef) diff --git a/src/bin/project_manager/project_manager.c b/src/bin/project_manager/project_manager.c index 9ed03f6..8a70118 100644 --- a/src/bin/project_manager/project_manager.c +++ b/src/bin/project_manager/project_manager.c @@ -438,6 +438,7 @@ _project_dummy_image_add(Project *project) { Evas *e; Evas_Object *edje_edit_obj; + char buf[PATH_MAX]; assert(project != NULL); @@ -448,7 +449,8 @@ _project_dummy_image_add(Project *project) edje_edit_obj = edje_edit_object_add(e); edje_object_file_set(edje_edit_obj, project->saved_edj, EFLETE_INTERNAL_GROUP_NAME); - edje_edit_image_add(edje_edit_obj, EFLETE_IMG_PATH EFLETE_DUMMY_IMAGE_NAME); + snprintf(buf, sizeof(buf), "%s"EFLETE_DUMMY_IMAGE_NAME, ap.path.image_path); + edje_edit_image_add(edje_edit_obj, buf); evas_object_del(edje_edit_obj); ecore_evas_free(project->ecore_evas); diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c index d352fd6..466381e 100644 --- a/src/bin/ui/colorclass_manager.c +++ b/src/bin/ui/colorclass_manager.c @@ -483,7 +483,7 @@ colorclass_manager_add(void) evas_object_show(bg); mng.edje_preview = edje_object_add(evas_object_evas_get(mng.preview_layout)); - if (!edje_object_file_set(mng.edje_preview, EFLETE_THEME, + if (!edje_object_file_set(mng.edje_preview, ap.path.theme_edj, "elm/layout/colorclass_manager/preview")) { ERR("Couldn't load layout for text example field!"); diff --git a/src/bin/ui/cursor.c b/src/bin/ui/cursor.c index e8c6b38..8f3dfbf 100644 --- a/src/bin/ui/cursor.c +++ b/src/bin/ui/cursor.c @@ -56,7 +56,7 @@ _cursor_object_get(Evas_Object *obj, Cursor_Type type) cur_name = eina_stringshare_printf("elm/cursor/%s/default", cursor_string[type]); cur_obj = edje_object_add(e); - edje_object_file_set(cur_obj, EFLETE_THEME, cur_name); + edje_object_file_set(cur_obj, ap.path.theme_edj, cur_name); edje_object_size_min_get(cur_obj, &x, &y); edje_object_size_min_restricted_calc(cur_obj, &x, &y, x, y); evas_object_resize(cur_obj, x, y); diff --git a/src/bin/ui/editors/animator_program_editor.c b/src/bin/ui/editors/animator_program_editor.c index c9295be..b4c456d 100644 --- a/src/bin/ui/editors/animator_program_editor.c +++ b/src/bin/ui/editors/animator_program_editor.c @@ -353,7 +353,7 @@ _slider_changed_cb(void *data, item = elm_layout_add(parent); \ evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, 0.0); \ evas_object_size_hint_align_set(item, EVAS_HINT_FILL, 0.0); \ - elm_layout_file_set(item, EFLETE_EDJ, "property/item/"style); \ + elm_layout_file_set(item, ap.path.layout_edj, "property/item/"style); \ elm_object_part_text_set(item, "elm.text", text); \ evas_object_show(item); diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index ae481c7..770cd34 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -90,7 +90,7 @@ _image_manager_image_setup(Evas_Object *image, if (ecore_file_exists(it->source)) elm_thumb_file_set(image, it->source, NULL); else - elm_thumb_file_set(image, EFLETE_THEME, "elm/image/icon/attention"); + elm_thumb_file_set(image, ap.path.theme_edj, "elm/image/icon/attention"); } else { @@ -141,7 +141,7 @@ _grid_content_get(void *data, if (eina_list_count(res->used_in) == 0) { image_obj = elm_icon_add(grid); - elm_image_file_set(image_obj, EFLETE_THEME, "elm/image/icon/attention"); + elm_image_file_set(image_obj, ap.path.theme_edj, "elm/image/icon/attention"); evas_object_show(image_obj); it->is_used = false; } @@ -187,6 +187,7 @@ _grid_sel_cb(void *data __UNUSED__, Eina_List *l; Eina_List *sel_list; Elm_Object_Item *grid_item = NULL; + char buf[PATH_MAX]; sel_list = (Eina_List *)elm_gengrid_selected_items_get(mng.gengrid); int selected_images_count = eina_list_count(sel_list); @@ -209,7 +210,7 @@ _grid_sel_cb(void *data __UNUSED__, if (ecore_file_exists(item->source)) elm_image_file_set(mng.image, item->source, NULL); else - elm_image_file_set(mng.image, EFLETE_THEME, "elm/image/icon/attention"); + elm_image_file_set(mng.image, ap.path.theme_edj, "elm/image/icon/attention"); } else { @@ -229,7 +230,8 @@ _grid_sel_cb(void *data __UNUSED__, break; } } - elm_image_file_set(mng.image, EFLETE_IMG_PATH EFLETE_DUMMY_IMAGE_NAME, NULL); + snprintf(buf, sizeof(buf), "%s"EFLETE_DUMMY_IMAGE_NAME, ap.path.image_path); + elm_image_file_set(mng.image, buf, NULL); } evas_object_smart_callback_call(ap.win, SIGNAL_IMAGE_SELECTED, item); } diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c index 820b638..9f45628 100644 --- a/src/bin/ui/menu.c +++ b/src/bin/ui/menu.c @@ -235,6 +235,7 @@ ui_menu_add(void) Evas_Object *window_menu; Menu *menu; int i = 0; + char buf[PATH_MAX]; assert(ap.win != NULL); assert(ap.win_layout != NULL); @@ -267,6 +268,8 @@ ui_menu_add(void) #define ___(PARENT_ID) \ elm_menu_item_separator_add(window_menu, menu->items[PARENT_ID]); + snprintf(buf, sizeof(buf), "%sicon-save.png", ap.path.image_path); + ITEM_MENU_ADD(MENU_NULL, MENU_FILE, NULL, _("File"), NULL) #if !HAVE_TIZEN ITEM_MENU_ADD(MENU_FILE, MENU_FILE_NEW_PROJECT, "file", _("New project"), NULL) @@ -274,7 +277,7 @@ ui_menu_add(void) ITEM_MENU_ADD(MENU_FILE, MENU_FILE_IMPORT_EDJ, NULL, _("Import edj-file"), NULL) ITEM_MENU_ADD(MENU_FILE, MENU_FILE_IMPORT_EDC, NULL, _("Import edc-file"), NULL) ___(MENU_FILE); - ITEM_MENU_ADD(MENU_FILE, MENU_FILE_SAVE, EFLETE_IMG_PATH"icon-save.png", _("Save"), "Ctrl-S") + ITEM_MENU_ADD(MENU_FILE, MENU_FILE_SAVE, buf, _("Save"), "Ctrl-S") ITEM_MENU_ADD(MENU_FILE, MENU_FILE_EXPORT_EDC, NULL, _("Export as edc"), NULL) ITEM_MENU_ADD(MENU_FILE_EXPORT_EDC, MENU_FILE_EXPORT_EDC_GROUP, NULL, _("Group"), NULL) ITEM_MENU_ADD(MENU_FILE_EXPORT_EDC, MENU_FILE_EXPORT_EDC_PROJECT, NULL, _("Project"), NULL) diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c index aa25bc3..3a350e8 100644 --- a/src/bin/ui/popup.c +++ b/src/bin/ui/popup.c @@ -701,7 +701,7 @@ _grid_content_get(void *data, if (eina_list_count(res->used_in) == 0) { image_obj = elm_icon_add(grid); - elm_image_file_set(image_obj, EFLETE_THEME, "elm/image/icon/attention"); + elm_image_file_set(image_obj, ap.path.theme_edj, "elm/image/icon/attention"); evas_object_show(image_obj); } } diff --git a/src/bin/ui/preference/preference.c b/src/bin/ui/preference/preference.c index 53ac559..d6856af 100644 --- a/src/bin/ui/preference/preference.c +++ b/src/bin/ui/preference/preference.c @@ -339,7 +339,7 @@ preferences_window_add(Project *project) evas_object_event_callback_add(preference->mwin, EVAS_CALLBACK_FREE, _on_preferences_close, preference); window_layout = elm_layout_add(preference->mwin); - elm_layout_file_set(window_layout, EFLETE_EDJ, "eflete/editor/default"); + elm_layout_file_set(window_layout, ap.path.layout_edj, "eflete/editor/default"); elm_win_inwin_content_set(preference->mwin, window_layout); panes = elm_panes_add(preference->mwin); diff --git a/src/bin/ui/property/property_common.c b/src/bin/ui/property/property_common.c index c3f0a8e..1c90832 100644 --- a/src/bin/ui/property/property_common.c +++ b/src/bin/ui/property/property_common.c @@ -438,7 +438,7 @@ _caption_content_get(void *data, if (pa->icon_name != NULL) { content = elm_image_add(obj); - res = elm_image_file_set(content, EFLETE_THEME, pa->icon_name); + res = elm_image_file_set(content, ap.path.theme_edj, pa->icon_name); assert(res == true); evas_object_data_set(content, PROPERTY_DATA, pd); @@ -466,7 +466,7 @@ _1swallow_content_get(void *data, if ((pa->icon_name != NULL) && (!strcmp(part, "swallow.icon"))) { content = elm_image_add(obj); - res = elm_image_file_set(content, EFLETE_THEME, pa->icon_name); + res = elm_image_file_set(content, ap.path.theme_edj, pa->icon_name); assert(res == true); evas_object_data_set(content, PROPERTY_DATA, pd); @@ -508,7 +508,7 @@ _2swallow_content_get(void *data, if ((pa->icon_name != NULL) && (!strcmp(part, "swallow.icon"))) { content = elm_image_add(obj); - res = elm_image_file_set(content, EFLETE_THEME, pa->icon_name); + res = elm_image_file_set(content, ap.path.theme_edj, pa->icon_name); assert(res == true); evas_object_data_set(content, PROPERTY_DATA, pd); diff --git a/src/bin/ui/property/property_group.c b/src/bin/ui/property/property_group.c index 958f677..2e93eda 100644 --- a/src/bin/ui/property/property_group.c +++ b/src/bin/ui/property/property_group.c @@ -753,15 +753,15 @@ _color_class_colors_fill(void *data __UNUSED__, FIXME: this is bad solition, user shoud not use edje object for add contnent to a * combobox item. Need to move combobox from edje ocject to layout. color = edje_object_add(canvas); - edje_object_file_set(color, EFLETE_THEME, "elm/image/color/color_set"); + edje_object_file_set(color, ap.path.theme_edj, "elm/image/color/color_set"); evas_object_color_set(color, cc_val[0], cc_val[1], cc_val[2], cc_val[3]); edje_object_part_swallow(item->content, "swallow.color1", color); color = edje_object_add(canvas); - edje_object_file_set(color, EFLETE_THEME, "elm/image/color/color_set"); + edje_object_file_set(color, ap.path.theme_edj, "elm/image/color/color_set"); evas_object_color_set(color, cc_val[4], cc_val[5], cc_val[6], cc_val[7]); edje_object_part_swallow(item->content, "swallow.color2", color); color = edje_object_add(canvas); - edje_object_file_set(color, EFLETE_THEME, "elm/image/color/color_set"); + edje_object_file_set(color, ap.path.theme_edj, "elm/image/color/color_set"); evas_object_color_set(color, cc_val[8], cc_val[9], cc_val[10], cc_val[11]); edje_object_part_swallow(item->content, "swallow.color3", color); } @@ -1046,17 +1046,17 @@ _init_cb(Property_Attribute *pa, Property_Action *action) elm_object_style_set(action->control, "color_class"); color = elm_image_add(action->control); - elm_image_file_set(color, EFLETE_THEME, "elm/image/color/color_set"); + elm_image_file_set(color, ap.path.theme_edj, "elm/image/color/color_set"); elm_object_part_content_set(action->control, "swallow.color1", color); evas_object_data_set(action->control, "color1", color); color = elm_image_add(action->control); - elm_image_file_set(color, EFLETE_THEME, "elm/image/color/color_set"); + elm_image_file_set(color, ap.path.theme_edj, "elm/image/color/color_set"); elm_object_part_content_set(action->control, "swallow.color2", color); evas_object_data_set(action->control, "color2", color); color = elm_image_add(action->control); - elm_image_file_set(color, EFLETE_THEME, "elm/image/color/color_set"); + elm_image_file_set(color, ap.path.theme_edj, "elm/image/color/color_set"); elm_object_part_content_set(action->control, "swallow.color3", color); evas_object_data_set(action->control, "color3", color); diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c index d6e55bb..714137a 100644 --- a/src/bin/ui/tab_home_import_edj.c +++ b/src/bin/ui/tab_home_import_edj.c @@ -246,7 +246,7 @@ _edj_set(Eina_Stringshare *title) char buf[256]; if (title) { - snprintf(buf, sizeof(buf), "%s/%s", EFLETE_TEMPLATE_EDJ_PATH, title); + snprintf(buf, sizeof(buf), "%s/template/edj/%s", ap.path.edj_path, title); elm_entry_entry_set(tab_edj.edj, buf); } else elm_entry_entry_set(tab_edj.edj, ""); @@ -595,6 +595,7 @@ _tab_import_edj_add(void) { Eina_List *themes = NULL, *l = NULL; char *theme; + char buf[PATH_MAX]; tab_edj.name_validator = elm_validator_regexp_new(NAME_REGEX, NULL); @@ -644,7 +645,8 @@ _tab_import_edj_add(void) tab_edj.itc->func.del = _combobox_item_del; elm_object_part_content_set(tab_edj.layout, "swallow.template_themes", tab_edj.themes); elm_object_text_set(tab_edj.themes, "template themes"); - themes = ecore_file_ls(EFLETE_TEMPLATE_EDJ_PATH); + snprintf(buf, sizeof(buf), "%stemplate/edj", ap.path.edj_path); + themes = ecore_file_ls(buf); EINA_LIST_FOREACH(themes, l, theme) { elm_genlist_item_append(tab_edj.themes, tab_edj.itc, diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c index a2e926f..6fa1ddb 100644 --- a/src/bin/ui/tab_home_new.c +++ b/src/bin/ui/tab_home_new.c @@ -284,7 +284,7 @@ _file_to_swap_copy(Eina_Stringshare *path, const char *widget_name) Eina_Stringshare *path_to = eina_stringshare_printf("%s/%s.edc", path, widget_name); Eina_Stringshare *path_from = - eina_stringshare_printf(EFLETE_TEMPLATE_EDC_PATH"/%s.edc", widget_name); + eina_stringshare_printf("%s/template/edc/%s.edc", ap.path.edj_path, widget_name); int ch; FILE *fp_from = fopen(path_from, "r"); @@ -475,9 +475,8 @@ _setup_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__) fclose(fp); flags = eina_strbuf_new(); - eina_strbuf_append_printf(flags, "-id \"%s\" -sd \"%s\" -v", - EFLETE_TEMPLATE_IMAGES_PATH, - EFLETE_TEMPLATE_SOUNDS_PATH); + eina_strbuf_append_printf(flags, "-id \"%s/template/images\" -sd \"%s/template/sounds\" -v", + ap.path.edj_path, ap.path.edj_path); pm_project_import_edc(elm_entry_entry_get(tab_new.name), elm_entry_entry_get(tab_new.path), diff --git a/src/bin/ui/workspace/container.c b/src/bin/ui/workspace/container.c index 8eb0fe8..68fe1d2 100644 --- a/src/bin/ui/workspace/container.c +++ b/src/bin/ui/workspace/container.c @@ -141,20 +141,20 @@ _style_set(Evas_Object *o, const char *style) snprintf(group, BUFF_MAX, "eflete/container/%s/%s", item, style); GROUP_NAME("base", style) - if (!edje_object_file_set(sd->container, EFLETE_EDJ, group)) + if (!edje_object_file_set(sd->container, ap.path.layout_edj, group)) { GROUP_NAME("base", "default") - if (!edje_object_file_set(sd->container, EFLETE_EDJ, group)) + if (!edje_object_file_set(sd->container, ap.path.layout_edj, group)) { ERR("Couldn't load default style for base border of container."); abort(); } } GROUP_NAME("handler_BR", style) - if (!edje_object_file_set(sd->handler_BR.obj, EFLETE_EDJ, group)) + if (!edje_object_file_set(sd->handler_BR.obj, ap.path.layout_edj, group)) { GROUP_NAME("handler_BR", "default") - if (!edje_object_file_set(sd->handler_BR.obj, EFLETE_EDJ, group)) + if (!edje_object_file_set(sd->handler_BR.obj, ap.path.layout_edj, group)) { ERR("Couldn't load default style for bottom-right handler of container."); abort(); diff --git a/src/bin/ui/workspace/highlight.c b/src/bin/ui/workspace/highlight.c index 43aa6d5..6f3fab1 100644 --- a/src/bin/ui/workspace/highlight.c +++ b/src/bin/ui/workspace/highlight.c @@ -505,7 +505,7 @@ _handler_object_add(Evas_Object *parent, assert(style != NULL); border = edje_object_add(evas_object_evas_get(parent)); - if (!edje_object_file_set(border, EFLETE_EDJ, style)) + if (!edje_object_file_set(border, ap.path.layout_edj, style)) { ERR("Could not load style for handler's border!"); abort(); @@ -588,7 +588,7 @@ _smart_add(Evas_Object *parent) _highlight_parent_sc->add(parent); border = edje_object_add(evas_object_evas_get(parent)); - if (!edje_object_file_set(border, EFLETE_EDJ, "eflete/highlight/border/default")) + if (!edje_object_file_set(border, ap.path.layout_edj, "eflete/highlight/border/default")) { ERR("Could not load style for main border!"); abort(); --
