From cea0fdc6af83b1633c41f8da93726cb60ce78126 Mon Sep 17 00:00:00 2001 From: Abhi Gupta Date: Fri, 11 Dec 2015 12:21:54 +0530 Subject: [PATCH] Modify edj_path in myfiles Change-Id: Ie3628ac658b14df4fd4a4e513bea109595738712 Signed-off-by: Abhi Gupta --- inc/mf-conf.h | 10 +++----- src/mf-main.c | 26 ++++++++++++++----- src/widget/mf-category-view.c | 6 ++++- src/widget/mf-context-popup.c | 21 ++++++++++----- src/widget/mf-detail-view.c | 6 ++++- src/widget/mf-gengrid.c | 16 +++++++----- src/widget/mf-genlist.c | 60 ++++++++++++++++++++++++++++--------------- src/widget/mf-navi-bar.c | 25 ++++++++++++++---- src/widget/mf-normal-view.c | 6 ++++- src/widget/mf-object.c | 44 ++++++++++++++++++++++++++----- src/widget/mf-popup.c | 28 +++++++++++++++++--- src/widget/mf-recent-view.c | 6 ++++- src/widget/mf-root-view.c | 11 ++++++-- src/widget/mf-search-view.c | 19 +++++++++++--- src/widget/mf-storage-view.c | 6 ++++- 15 files changed, 219 insertions(+), 71 deletions(-) diff --git a/inc/mf-conf.h b/inc/mf-conf.h index 883bdfd..a8cbafb 100755 --- a/inc/mf-conf.h +++ b/inc/mf-conf.h @@ -28,16 +28,14 @@ #define EDJ_PATH "/usr/apps/org.tizen.myfile/res/edje" #define ICON_PATH "/usr/apps/org.tizen.myfile/res/images" -#define EDJ_NAVIGATIONBAR EDJ_PATH"/myfileNavigationBar.edj" -#define EDJ_IMAGE EDJ_PATH"/edc_image_macro.edj" +#define EDJ_IMAGE "edc_image_macro.edj" #define GRP_NAVI_VIEW "navigation_view" -#define EDJ_SEARCHBAR EDJ_PATH"/myfileSearchBar.edj" #define GRP_SEARCH_BAR "search_bar" -#define EDJ_NAME EDJ_PATH"/myfile.edj" -#define EDJ_GENLIST_NAME EDJ_PATH"/myfile_genlist.edj" -#define EDJ_GENGRID_NAME EDJ_PATH"/myfile_gengrid.edj" +#define EDJ_NAME "myfile.edj" +#define EDJ_GENLIST_NAME "myfile_genlist.edj" +#define EDJ_GENGRID_NAME "myfile_gengrid.edj" #define GRP_THUMBNAIL_ONLY "thumbnail_only" #define GRP_GENGRID_COTENT "gengrid_content" #define GRP_PROGRESS_LABEL "label" diff --git a/src/mf-main.c b/src/mf-main.c index a12244f..cef4dbd 100755 --- a/src/mf-main.c +++ b/src/mf-main.c @@ -301,8 +301,11 @@ __mf_main_app_init_idler_cb(void *data) t_start; assert(data); struct appdata *ap = (struct appdata *)data; - - elm_theme_extension_add(NULL, EDJ_NAME); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + elm_theme_extension_add(NULL, edj_path); SAFE_FREE_ECORE_EVENT(ap->mf_MainWindow.font_event); @@ -541,8 +544,16 @@ bool __mf_main_create_app(void *data) MF_TA_ACUM_ITEM_END("1234 mf_object_create_layout_main", 0); - elm_theme_extension_add(NULL, EDJ_GENLIST_NAME); - elm_theme_extension_add(NULL, EDJ_GENGRID_NAME); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path , "edje", EDJ_GENLIST_NAME); + elm_theme_extension_add(NULL, edj_path); + + memset(edj_path, 0, 1024); + + snprintf(edj_path, 1024, "%s%s/%s", path , "edje", EDJ_GENGRID_NAME); + free(path); + elm_theme_extension_add(NULL, edj_path); MF_TA_ACUM_ITEM_BEGIN("1234 create naviframe", 0); mf_view_phone_storage_init(ap); @@ -831,8 +842,11 @@ void __mf_main_terminate_app(void *data) mf_genlist_item_class_free(ap->mf_gl_style.order_itc); mf_util_set_pm_lock(ap, EINA_FALSE); - - elm_theme_extension_del(NULL, EDJ_NAME); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + elm_theme_extension_del(NULL, edj_path); t_end; MF_TRACE_END; diff --git a/src/widget/mf-category-view.c b/src/widget/mf-category-view.c index 17c06cc..09be866 100755 --- a/src/widget/mf-category-view.c +++ b/src/widget/mf-category-view.c @@ -1037,6 +1037,10 @@ void mf_category_view_create(void *data, bool flag_show) Evas_Object *newContent = NULL; ap->mf_Status.view_type = mf_view_root_category; //int view_style = mf_view_style_get(ap); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); mf_navi_bar_reset_navi_obj(ap); mf_util_free_eina_list_with_data(&(ap->mf_FileOperation.recent_list), MYFILE_TYPE_FSNODE); @@ -1049,7 +1053,7 @@ void mf_category_view_create(void *data, bool flag_show) ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem; - ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "view_layout"); + ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, edj_path, "view_layout"); mf_navi_bar_layout_state_set(ap->mf_MainWindow.pNaviLayout, mf_navi_layout_normal); ap->mf_MainWindow.pNaviBox = mf_object_create_box(ap->mf_MainWindow.pNaviLayout); mf_navi_bar_layout_content_set(ap->mf_MainWindow.pNaviLayout, ap->mf_MainWindow.pNaviBox); diff --git a/src/widget/mf-context-popup.c b/src/widget/mf-context-popup.c index 45fa21d..643ed21 100755 --- a/src/widget/mf-context-popup.c +++ b/src/widget/mf-context-popup.c @@ -633,10 +633,15 @@ static void __mf_search_filter_selected(void *data, int category, const char *ic MF_TRACE_BEGIN; mf_retm_if(data == NULL, "data is NULL"); struct appdata* ap = (struct appdata *)data; + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); + if (ap->mf_Status.search_category != category) { ap->mf_Status.search_category = category; if (ap->mf_MainWindow.pSearchCategoryBtn) { - elm_image_file_set(ap->mf_MainWindow.pSearchCategoryBtn, EDJ_IMAGE, icon_buf); + elm_image_file_set(ap->mf_MainWindow.pSearchCategoryBtn, edj_path, icon_buf); } mf_search_bar_view_update(ap); } @@ -712,29 +717,33 @@ Evas_Object *mf_context_popup_search_filter(Evas_Object *parent, void *user_data searchfilter_ctxpopup = ctxpopup; Evas_Object *icon = NULL; elm_ctxpopup_horizontal_set(ctxpopup, EINA_FALSE); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); icon = elm_image_add(ctxpopup); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_SEARCH_CATEGORY_ALL); + elm_image_file_set(icon, edj_path, IMG_ICON_SEARCH_CATEGORY_ALL); item = elm_ctxpopup_item_append(ctxpopup, MF_POP_SEARCH_ALL, icon, __mf_search_filter_all_selected, user_data); mf_object_item_translate_set(item, MF_POP_SEARCH_ALL); icon = elm_image_add(ctxpopup); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_SEARCH_CATEGORY_IMG); + elm_image_file_set(icon, edj_path, IMG_ICON_SEARCH_CATEGORY_IMG); item = elm_ctxpopup_item_append(ctxpopup, MF_POP_SEARCH_IMAGES, icon, __mf_search_filter_img_selected, user_data); mf_object_item_translate_set(item, MF_POP_SEARCH_IMAGES); icon = elm_image_add(ctxpopup); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_SEARCH_CATEGORY_VIDEO); + elm_image_file_set(icon, edj_path, IMG_ICON_SEARCH_CATEGORY_VIDEO); item = elm_ctxpopup_item_append(ctxpopup, MF_POP_SEARCH_VIDEOS, icon, __mf_search_filter_video_selected, user_data); mf_object_item_translate_set(item, MF_POP_SEARCH_VIDEOS); icon = elm_image_add(ctxpopup); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_SEARCH_CATEGORY_SND); + elm_image_file_set(icon, edj_path, IMG_ICON_SEARCH_CATEGORY_SND); item = elm_ctxpopup_item_append(ctxpopup, MF_POP_SEARCH_SOUNDS, icon, __mf_search_filter_snd_selected, user_data); mf_object_item_translate_set(item, MF_POP_SEARCH_SOUNDS); icon = elm_image_add(ctxpopup); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_SEARCH_CATEGORY_DOC); + elm_image_file_set(icon, edj_path, IMG_ICON_SEARCH_CATEGORY_DOC); item = elm_ctxpopup_item_append(ctxpopup, MF_POP_SEARCH_DOCUMENTS, icon, __mf_search_filter_doc_selected, user_data); mf_object_item_translate_set(item, MF_POP_SEARCH_DOCUMENTS); diff --git a/src/widget/mf-detail-view.c b/src/widget/mf-detail-view.c index 4f4bcd2..138a0f5 100755 --- a/src/widget/mf-detail-view.c +++ b/src/widget/mf-detail-view.c @@ -107,8 +107,12 @@ void mf_detail_view_create(void *data) mf_retm_if(ap->mf_MainWindow.pNaviBar == NULL, "ap->mf_MainWindow.pNaviBar is NULL"); mf_navi_bar_reset_navi_obj(ap); ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem; + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); - ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "view_layout"); + ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, edj_path, "view_layout"); mf_navi_bar_layout_state_set(ap->mf_MainWindow.pNaviLayout, mf_navi_layout_content_only); ap->mf_MainWindow.pNaviBox = mf_object_create_box(ap->mf_MainWindow.pNaviLayout); diff --git a/src/widget/mf-gengrid.c b/src/widget/mf-gengrid.c index b943825..340a358 100755 --- a/src/widget/mf-gengrid.c +++ b/src/widget/mf-gengrid.c @@ -206,6 +206,10 @@ Evas_Object *mf_gengrid_item_icon_get(void *data, Evas_Object *obj, const char * mf_retvm_if(part == NULL, NULL, "part is NULL"); mf_retvm_if(obj == NULL, NULL, "obj is NULL"); mf_retvm_if(ap == NULL, NULL, "ap is NULL"); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); if (!strcmp(part, "elm.swallow.icon")) { Evas_Object *thumb = NULL; @@ -256,9 +260,9 @@ Evas_Object *mf_gengrid_item_icon_get(void *data, Evas_Object *obj, const char * elm_image_smooth_set(thumb, EINA_FALSE); if (params->file_type == FILE_TYPE_IMAGE) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_IMAGE); + elm_image_file_set(thumb, edj_path, MF_ICON_IMAGE); } else if (params->file_type == FILE_TYPE_VIDEO) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_VIDEO); + elm_image_file_set(thumb, edj_path, MF_ICON_VIDEO); } else { elm_image_file_set(thumb, params->thumb_path, NULL); } @@ -299,9 +303,9 @@ Evas_Object *mf_gengrid_item_icon_get(void *data, Evas_Object *obj, const char * elm_image_smooth_set(thumb, EINA_FALSE); if (params->file_type == FILE_TYPE_IMAGE) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_IMAGE); + elm_image_file_set(thumb, edj_path, MF_ICON_IMAGE); } else if (params->file_type == FILE_TYPE_VIDEO) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_VIDEO); + elm_image_file_set(thumb, edj_path, MF_ICON_VIDEO); } else { elm_image_file_set(thumb, params->thumb_path, NULL); } @@ -332,13 +336,13 @@ Evas_Object *mf_gengrid_item_icon_get(void *data, Evas_Object *obj, const char * bool is_using_original_image_at_phone_or_mmc = (params->thumbnail_type == MF_THUMBNAIL_DEFAULT && params->file_type == FILE_TYPE_IMAGE && is_phone_or_mmc && params->m_ItemName->str);//Fixed the P131112-03632. if (params->file_type == FILE_TYPE_DIR) { thumb = elm_image_add(obj); - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); elm_image_fill_outside_set(thumb, EINA_TRUE); elm_image_smooth_set(thumb, EINA_FALSE); elm_image_preload_disabled_set(thumb, EINA_FALSE); } else if (params->thumbnail_type == MF_THUMBNAIL_DEFAULT && (is_using_original_image_at_phone_or_mmc == false)) { thumb = elm_image_add(obj); - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); elm_image_fill_outside_set(thumb, EINA_TRUE); elm_image_smooth_set(thumb, EINA_FALSE); elm_image_preload_disabled_set(thumb, EINA_FALSE); diff --git a/src/widget/mf-genlist.c b/src/widget/mf-genlist.c index 6a7bc5a..16564bd 100755 --- a/src/widget/mf-genlist.c +++ b/src/widget/mf-genlist.c @@ -436,7 +436,10 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec mf_retvm_if(part == NULL, NULL, "part is NULL"); mf_retvm_if(obj == NULL, NULL, "obj is NULL"); mf_retvm_if(ap == NULL, NULL, "ap is NULL"); - + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); if (!strcmp(part, "elm.icon.folder")) { if (ap->mf_Status.view_type == mf_view_root || ap->mf_Status.view_type == mf_view_storage) { @@ -445,7 +448,7 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec elm_image_prescale_set(check, MF_GENLIST_THUMBNAIL_SIZE); elm_image_fill_outside_set(check, EINA_FALSE); elm_image_smooth_set(check, EINA_FALSE); - elm_image_file_set(check, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(check, edj_path, params->thumb_path); evas_object_repeat_events_set(check, EINA_TRUE); evas_object_propagate_events_set(check, EINA_FALSE); //elm_layout_content_set(content, "elm.swallow.content", check); @@ -550,7 +553,7 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec if (isOriginalImage == 0) { mf_file_attr_get_file_size(params->thumb_path, &size); if (size < 4 * 1024 * 1024) { - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); //elm_object_part_content_set(layout, "default_thumbnail", thumb); //elm_layout_content_set(layout, "elm.swallow.content", thumb); } @@ -571,11 +574,11 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec thumb = elm_image_add(obj); elm_image_fill_outside_set(thumb, EINA_TRUE); if (params->file_type == FILE_TYPE_IMAGE) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_IMAGE); + elm_image_file_set(thumb, edj_path, MF_ICON_IMAGE); } else if (params->file_type == FILE_TYPE_VIDEO) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_VIDEO); + elm_image_file_set(thumb, edj_path, MF_ICON_VIDEO); } else if (params->thumbnail_type == MF_THUMBNAIL_DEFAULT) { - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); } elm_image_smooth_set(thumb, EINA_FALSE); elm_image_preload_disabled_set(thumb, EINA_FALSE); @@ -613,11 +616,11 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec thumb = elm_image_add(obj); elm_image_fill_outside_set(thumb, EINA_TRUE); if (params->file_type == FILE_TYPE_IMAGE) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_IMAGE); + elm_image_file_set(thumb, edj_path, MF_ICON_IMAGE); } else if (params->file_type == FILE_TYPE_VIDEO) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_VIDEO); + elm_image_file_set(thumb, edj_path, MF_ICON_VIDEO); } else if (params->thumbnail_type == MF_THUMBNAIL_DEFAULT) { - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); } elm_image_smooth_set(thumb, EINA_FALSE); elm_image_preload_disabled_set(thumb, EINA_FALSE); @@ -639,9 +642,9 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec elm_image_fill_outside_set(thumb, EINA_TRUE); elm_image_smooth_set(thumb, EINA_FALSE); if (params->file_type == FILE_TYPE_MUSIC || params->file_type == FILE_TYPE_SOUND) { - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); } else if (params->thumbnail_type == MF_THUMBNAIL_DEFAULT) { - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); } else { elm_image_file_set(thumb, params->thumb_path, NULL); } @@ -654,9 +657,11 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec } if (params->thumb_path && strstr(params->thumb_path, "thumb_default.png")) { + memset(edj_path,0,1024); + snprintf(edj_path, 1024, "%s%s/%s", path , "edje", EDJ_NAME); mf_debug("Applying default thumbnail!!"); Evas_Object *layout = elm_layout_add(obj); - elm_layout_file_set(layout, EDJ_NAME, "default_thumb_bg"); + elm_layout_file_set(layout, edj_path, "default_thumb_bg"); elm_object_part_content_set(layout, "thumb_swallow", thumb); evas_object_show(layout); return layout; @@ -664,11 +669,11 @@ static Evas_Object *__mf_genlist_gl_default_icon_get_lite(void *data, Evas_Objec if (strstr(params->m_ItemName->str, "/.") != NULL) { if (params->file_type == FILE_TYPE_IMAGE) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_IMAGE); + elm_image_file_set(thumb, edj_path, MF_ICON_IMAGE); } else if (params->file_type == FILE_TYPE_VIDEO) { - elm_image_file_set(thumb, EDJ_IMAGE, MF_ICON_VIDEO); + elm_image_file_set(thumb, edj_path, MF_ICON_VIDEO); } else if (params->thumbnail_type == MF_THUMBNAIL_DEFAULT) { - elm_image_file_set(thumb, EDJ_IMAGE, params->thumb_path); + elm_image_file_set(thumb, edj_path, params->thumb_path); } elm_image_smooth_set(thumb, EINA_FALSE); } @@ -785,13 +790,18 @@ void mf_genlist_disable_items(Evas_Object *genlist, Eina_Bool disable) static Evas_Object *__mf_genlist_widget_storage_content_get(void *data, Evas_Object *obj, const char *part) { if (!strcmp(part, "elm.icon.1")) { - Evas_Object *layout = mf_object_create_layout(obj, EDJ_GENLIST_NAME, "genlist_content"); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_GENLIST_NAME); + free(path); + Evas_Object *layout = mf_object_create_layout(obj, edj_path, "genlist_content"); mf_retvm_if(layout == NULL, NULL, "Failed to create layout"); Evas_Object *cloud_icon = elm_icon_add(layout); mf_retvm_if(cloud_icon == NULL, NULL, "Failed to add cloud icon"); - - elm_image_file_set(cloud_icon, EDJ_IMAGE, MF_ICON_FOLDER); + memset(edj_path,0,1024); + snprintf(edj_path, 1024, "%s%s/%s", path , "edje", EDJ_IMAGE); + elm_image_file_set(cloud_icon, edj_path, MF_ICON_FOLDER); elm_image_resizable_set(cloud_icon, EINA_TRUE, EINA_TRUE); elm_layout_content_set(layout, "elm.swallow.content", cloud_icon); @@ -1425,7 +1435,12 @@ static void __mf_genlist_widget_storage_selected_cb(void *data, Evas_Object *obj mf_error("Fail to create Layout"); return; } - elm_layout_file_set(cloud_data->navi_layout, EDJ_NAME, "navi_layout"); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + + elm_layout_file_set(cloud_data->navi_layout, edj_path, "navi_layout"); int result = mf_genlist_get_cloud_file_list(cloud_data->curr_path, &cloud_data->file_list); cloud_data->cloud_item_genlist = elm_genlist_add(cloud_data->navi_layout); @@ -1510,7 +1525,12 @@ static Evas_Object *__mf_genlist_widget_cloud_item_content_get(void *data, Evas_ node_info *pNode = (node_info *)data; if (!strcmp(part, "elm.icon.1")) { mf_retvm_if(pNode == NULL, NULL, "pNode is NULL"); - Evas_Object *layout = mf_object_create_layout(obj, EDJ_GENLIST_NAME, "genlist_content"); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_GENLIST_NAME); + free(path); + + Evas_Object *layout = mf_object_create_layout(obj, edj_path, "genlist_content"); Evas_Object *cloud_icon = elm_icon_add(layout); elm_image_file_set(cloud_icon, pNode->thumb_path, NULL); elm_image_resizable_set(cloud_icon, EINA_TRUE, EINA_TRUE); diff --git a/src/widget/mf-navi-bar.c b/src/widget/mf-navi-bar.c index a683c22..16a51f9 100755 --- a/src/widget/mf-navi-bar.c +++ b/src/widget/mf-navi-bar.c @@ -276,7 +276,11 @@ void mf_navi_bar_title_content_set(void *data, const char *title) Evas_Object *mf_navi_bar_home_button_create(Evas_Object *parent, Evas_Smart_Cb func, void *user_data) { Evas_Object *home_ic = elm_image_add(parent); - elm_image_file_set(home_ic, EDJ_IMAGE, MF_TITLE_ICON_HOME); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); + elm_image_file_set(home_ic, edj_path, MF_TITLE_ICON_HOME); elm_image_resizable_set(home_ic, EINA_TRUE, EINA_TRUE); evas_object_show(home_ic); @@ -292,9 +296,12 @@ Evas_Object *mf_navi_bar_home_button_create(Evas_Object *parent, Evas_Smart_Cb f Evas_Object *mf_navi_bar_search_button_create(Evas_Object *parent, Evas_Smart_Cb func, void *user_data) { - + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *image = elm_image_add(parent); - elm_image_file_set(image, EDJ_IMAGE, MF_TITLE_ICON_SEARCH); + elm_image_file_set(image, edj_path, MF_TITLE_ICON_SEARCH); elm_image_resizable_set(image, EINA_TRUE, EINA_TRUE); evas_object_show(image); @@ -311,8 +318,12 @@ Evas_Object *mf_navi_bar_search_button_create(Evas_Object *parent, Evas_Smart_Cb Evas_Object *mf_navi_bar_upper_button_create(Evas_Object *parent, Evas_Smart_Cb func, void *user_data) { + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *up_ic = elm_image_add(parent); - elm_image_file_set(up_ic, EDJ_IMAGE, MF_TITLE_ICON_UPPER); + elm_image_file_set(up_ic, edj_path, MF_TITLE_ICON_UPPER); elm_image_resizable_set(up_ic, EINA_TRUE, EINA_TRUE); evas_object_show(up_ic); @@ -328,8 +339,12 @@ Evas_Object *mf_navi_bar_upper_button_create(Evas_Object *parent, Evas_Smart_Cb Evas_Object *mf_navi_bar_select_all_button_create(Evas_Object *parent, Evas_Smart_Cb func, void *user_data) { + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *select_ic = elm_image_add(parent); - elm_image_file_set(select_ic, EDJ_IMAGE, MF_TITLE_ICON_SELECT_ALL); + elm_image_file_set(select_ic, edj_path, MF_TITLE_ICON_SELECT_ALL); elm_image_resizable_set(select_ic, EINA_TRUE, EINA_TRUE); evas_object_show(select_ic); diff --git a/src/widget/mf-normal-view.c b/src/widget/mf-normal-view.c index ac83417..9dc82b0 100755 --- a/src/widget/mf-normal-view.c +++ b/src/widget/mf-normal-view.c @@ -93,8 +93,12 @@ void mf_normal_view_create(void *data) mf_navi_bar_reset_navi_obj(ap); ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem; + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); - ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "view_layout"); + ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, edj_path, "view_layout"); mf_navi_bar_layout_state_set(ap->mf_MainWindow.pNaviLayout, mf_navi_layout_normal); diff --git a/src/widget/mf-object.c b/src/widget/mf-object.c index 36d0a5d..340ba70 100755 --- a/src/widget/mf-object.c +++ b/src/widget/mf-object.c @@ -96,9 +96,13 @@ Evas_Object *mf_object_create_no_content(Evas_Object *parent) Evas_Object *nocontent = elm_layout_add(parent); elm_layout_theme_set(nocontent, "layout", "nocontents", "text"); elm_object_focus_set(nocontent, EINA_FALSE); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *icon = elm_image_add(nocontent); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_MULTI_NO_CONTENTS); + elm_image_file_set(icon, edj_path, IMG_ICON_MULTI_NO_CONTENTS); elm_object_part_content_set(nocontent, "nocontents.image", icon); evas_object_size_hint_weight_set(nocontent, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(nocontent, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -117,9 +121,13 @@ Evas_Object *mf_object_create_text_no_content(Evas_Object *parent) Evas_Object *nocontent = elm_layout_add(parent); elm_layout_theme_set(nocontent, "layout", "nocontents", "text"); elm_object_focus_set(nocontent, EINA_FALSE); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *icon = elm_image_add(nocontent); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_TEXT_NO_CONTENTS); + elm_image_file_set(icon, edj_path, IMG_ICON_TEXT_NO_CONTENTS); elm_object_part_content_set(nocontent, "nocontents.image", icon); evas_object_size_hint_weight_set(nocontent, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(nocontent, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -138,9 +146,13 @@ Evas_Object *mf_object_create_pic_no_content(Evas_Object *parent) Evas_Object *nocontent = elm_layout_add(parent); elm_layout_theme_set(nocontent, "layout", "nocontents", "text"); elm_object_focus_set(nocontent, EINA_FALSE); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *icon = elm_image_add(nocontent); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_IMG_NO_CONTENTS); + elm_image_file_set(icon, edj_path, IMG_ICON_IMG_NO_CONTENTS); elm_object_part_content_set(nocontent, "nocontents.image", icon); evas_object_size_hint_weight_set(nocontent, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(nocontent, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -159,9 +171,13 @@ Evas_Object *mf_object_create_multi_no_content(Evas_Object *parent) Evas_Object *nocontent = elm_layout_add(parent); elm_layout_theme_set(nocontent, "layout", "nocontents", "text"); elm_object_focus_set(nocontent, EINA_FALSE); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *icon = elm_image_add(nocontent); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_MULTI_NO_CONTENTS); + elm_image_file_set(icon, edj_path, IMG_ICON_MULTI_NO_CONTENTS); elm_object_part_content_set(nocontent, "nocontents.image", icon); evas_object_size_hint_weight_set(nocontent, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(nocontent, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -180,9 +196,13 @@ Evas_Object *mf_object_create_dev_no_content(Evas_Object *parent) Evas_Object *nocontent = elm_layout_add(parent); elm_layout_theme_set(nocontent, "layout", "nocontents", "text"); elm_object_focus_set(nocontent, EINA_FALSE); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); Evas_Object *icon = elm_image_add(nocontent); - elm_image_file_set(icon, EDJ_IMAGE, IMG_ICON_DEV_NO_CONTENTS); + elm_image_file_set(icon, edj_path, IMG_ICON_DEV_NO_CONTENTS); elm_object_part_content_set(nocontent, "nocontents.image", icon); evas_object_size_hint_weight_set(nocontent, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(nocontent, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -417,9 +437,14 @@ Evas_Object *mf_object_create_select_all_btn(Evas_Object *parent, void *data) Evas_Object *btn = elm_button_add(parent); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + elm_object_style_set(btn, "naviframe/title_icon"); Evas_Object *icon = elm_icon_add(btn); - elm_image_file_set(icon, EDJ_NAME, "icon.select_all"); + elm_image_file_set(icon, edj_path, "icon.select_all"); evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1 , 1); elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE); elm_object_content_set(btn, icon); @@ -463,8 +488,13 @@ void mf_object_create_select_all_layout(Evas_Object *pParent, Evas_Smart_Cb pCha Evas_Object_Event_Cb pMouseDownFunc, void *pUserData, Evas_Object **pCheckBox, Evas_Object **pSelectLayout) { Evas_Object *pSelectAllLayout = elm_layout_add(pParent); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + //elm_layout_theme_set(pSelectAllLayout, "genlist", "item", "select_all/default"); - elm_layout_file_set(pSelectAllLayout, EDJ_NAME, "select.all.layout"); + elm_layout_file_set(pSelectAllLayout, edj_path, "select.all.layout"); evas_object_size_hint_weight_set(pSelectAllLayout, EVAS_HINT_EXPAND, EVAS_HINT_FILL); evas_object_size_hint_align_set(pSelectAllLayout, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_event_callback_add(pSelectAllLayout, EVAS_CALLBACK_MOUSE_DOWN, pMouseDownFunc, pUserData); diff --git a/src/widget/mf-popup.c b/src/widget/mf-popup.c index 0b3a012..ecfe6f6 100755 --- a/src/widget/mf-popup.c +++ b/src/widget/mf-popup.c @@ -566,9 +566,14 @@ Evas_Object *mf_popup_create_pb_popup(void *data, char *title, char *context, in /*if (title) { mf_object_text_set(popup, title, "title,text"); }*/ + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + layout = elm_layout_add(popup); elm_object_focus_set(layout, EINA_FALSE); - elm_layout_file_set(layout, EDJ_NAME, "popup_center_progressview"); + elm_layout_file_set(layout, edj_path, "popup_center_progressview"); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); ap->mf_MainWindow.pProgressLayout = layout; @@ -655,7 +660,12 @@ Evas_Object *mf_popup_entry_layout_create(Evas_Object *parent) { Evas_Object *layout = elm_layout_add(parent); elm_object_focus_set(layout, EINA_TRUE); - elm_layout_file_set(layout, EDJ_NAME, "popup_new_folder"); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + + elm_layout_file_set(layout, edj_path, "popup_new_folder"); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); return layout; } @@ -2000,8 +2010,13 @@ Evas_Object *mf_popup_check_view_popup(void *data, mf_object_text_set(popup, title, "title,text"); } /* layout */ + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + layout = elm_layout_add(popup); - elm_layout_file_set(layout, EDJ_NAME, "popup_checkview_layout"); + elm_layout_file_set(layout, edj_path, "popup_checkview_layout"); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_text_set(layout, "elm.text", "Description text"); @@ -2382,8 +2397,13 @@ Evas_Object *mf_popup_replace_create(char *title, char *label_text, Evas_Smart_C evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); mf_object_text_set(popup, title, "title,text"); /* layout */ + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); + Evas_Object *layout = elm_layout_add(popup); - elm_layout_file_set(layout, EDJ_NAME, "popup_confirmation_layout"); + elm_layout_file_set(layout, edj_path, "popup_confirmation_layout"); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_smart_callback_add(layout, "language,changed", _language_changed, ap); diff --git a/src/widget/mf-recent-view.c b/src/widget/mf-recent-view.c index 0511d78..942d399 100755 --- a/src/widget/mf-recent-view.c +++ b/src/widget/mf-recent-view.c @@ -132,9 +132,13 @@ void mf_recent_view_create(void *data) mf_navi_bar_reset_navi_obj(ap); Evas_Object *pathinfo = NULL; + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem; - ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "view_layout"); + ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, edj_path, "view_layout"); mf_navi_bar_layout_state_set(ap->mf_MainWindow.pNaviLayout, mf_navi_layout_normal); ap->mf_MainWindow.pNaviBox = mf_object_create_box(ap->mf_MainWindow.pNaviLayout); mf_navi_bar_layout_content_set(ap->mf_MainWindow.pNaviLayout, ap->mf_MainWindow.pNaviBox); diff --git a/src/widget/mf-root-view.c b/src/widget/mf-root-view.c index 38bc5aa..3f4d2e0 100755 --- a/src/widget/mf-root-view.c +++ b/src/widget/mf-root-view.c @@ -490,8 +490,11 @@ void mf_root_view_create(void *data) local_index_item = NULL; mf_navi_bar_reset_navi_obj(ap); ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem; + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); - ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "view_layout"); + ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, edj_path, "view_layout"); mf_navi_bar_layout_state_set(ap->mf_MainWindow.pNaviLayout, mf_navi_layout_content_only); MF_TA_ACUM_ITEM_END("123456 create root view layout", 0); @@ -522,15 +525,19 @@ void mf_root_view_create(void *data) Evas_Object *float_button = eext_floatingbutton_add(ap->mf_MainWindow.pNaviLayout); Evas_Object *btn = elm_button_add(float_button); if (float_button && btn) { + memset(edj_path, 0, 1024); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + elm_object_part_content_set(float_button, "button1", btn); Evas_Object *search_image = elm_image_add(float_button); - elm_image_file_set(search_image, EDJ_IMAGE, MF_TITLE_ICON_SEARCH); + elm_image_file_set(search_image, edj_path, MF_TITLE_ICON_SEARCH); elm_image_resizable_set(search_image, EINA_TRUE, EINA_TRUE); evas_object_show(search_image); elm_object_part_content_set(btn, "icon", search_image); evas_object_smart_callback_add(btn, "clicked", mf_root_view_enter_search_routine, ap); elm_object_part_content_set(ap->mf_MainWindow.pNaviLayout, "search_icon", float_button); } + free(path); MF_TA_ACUM_ITEM_END("123456 push naviframe item", 0); diff --git a/src/widget/mf-search-view.c b/src/widget/mf-search-view.c index 2e569f4..09fbe1b 100755 --- a/src/widget/mf-search-view.c +++ b/src/widget/mf-search-view.c @@ -137,8 +137,11 @@ Evas_Object *mf_search_view_create_search_bar(Evas_Object * parent, void *data) Evas_Object *en = NULL; sb = elm_layout_add(parent); + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); - elm_layout_file_set(sb, EDJ_NAME, "myfile_search_layout"); + elm_layout_file_set(sb, edj_path, "myfile_search_layout"); //elm_layout_theme_set(sb, "layout", "searchbar", "cancel_button"); en = elm_entry_add(sb); @@ -165,7 +168,11 @@ Evas_Object *mf_search_view_create_search_bar(Evas_Object * parent, void *data) elm_object_signal_callback_add(sb, "elm,eraser,clicked", "elm", mf_callback_eraser_clicked_cb, en); Evas_Object *back_btn = elm_image_add(sb); - elm_image_file_set(back_btn, EDJ_IMAGE, MF_ICON_SOFT_SEARCH_CANCEL); + memset(edj_path, 0, 1024); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_IMAGE); + free(path); + + elm_image_file_set(back_btn, edj_path, MF_ICON_SOFT_SEARCH_CANCEL); elm_image_resizable_set(back_btn, EINA_TRUE, EINA_TRUE); elm_image_prescale_set(back_btn, 100); elm_image_fill_outside_set(back_btn, TRUE); @@ -181,7 +188,7 @@ Evas_Object *mf_search_view_create_search_bar(Evas_Object * parent, void *data) elm_entry_markup_filter_append(en, elm_entry_filter_limit_size, &limit_filter_data); Evas_Object *pImage = elm_image_add(sb); - elm_image_file_set(pImage, EDJ_IMAGE, MF_ICON_SOFT_SEARCH_BACK); + elm_image_file_set(pImage, edj_path, MF_ICON_SOFT_SEARCH_BACK); elm_image_resizable_set(pImage, EINA_TRUE, EINA_TRUE); evas_object_show(pImage); @@ -238,8 +245,12 @@ void mf_search_view_create(void *data) } else { ap->mf_Status.search_category = mf_tray_item_category_none; } + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); - ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "search_view_layout"); + ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, edj_path, "search_view_layout"); ap->mf_MainWindow.pNaviSearchBar = mf_search_view_create_search_bar(ap->mf_MainWindow.pNaviLayout, ap); Evas_Object *bx = elm_box_add(ap->mf_MainWindow.pNaviLayout); elm_box_pack_start(bx, ap->mf_MainWindow.pNaviSearchBar); diff --git a/src/widget/mf-storage-view.c b/src/widget/mf-storage-view.c index 8e1a625..a1d5b9d 100755 --- a/src/widget/mf-storage-view.c +++ b/src/widget/mf-storage-view.c @@ -82,8 +82,12 @@ void mf_storage_view_create(void *data) mf_retm_if(ap->mf_MainWindow.pNaviBar == NULL, "ap->mf_MainWindow.pNaviBar is NULL"); mf_navi_bar_reset_navi_obj(ap); ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem; + char edj_path[1024] = {0}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", EDJ_NAME); + free(path); - ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "view_layout"); + ap->mf_MainWindow.pNaviLayout = mf_object_create_layout(ap->mf_MainWindow.pNaviBar, edj_path, "view_layout"); mf_navi_bar_layout_state_set(ap->mf_MainWindow.pNaviLayout, mf_navi_layout_normal); -- 2.7.4