Removed Resource Paths from Music Chooser

Change-Id: If8d182632ac0d6b067087b873c0a94acf71b9425
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/music-chooser/CMakeLists.txt b/music-chooser/CMakeLists.txt
index 4923514d4833aa1770d6c242e854b8c2160bca48..fcca49242aed019ae7f03ee3400a4b05c2fef0ef 100755 (executable)
--- a/music-chooser/CMakeLists.txt
+++ b/music-chooser/CMakeLists.txt
@@ -65,8 +65,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm)
 SET(BINDIR "${MC_PREFIX}/bin")
 
 # set extra defines
-SET(IMAGES_DIR "${MC_PREFIX}/shared/trusted/music-chooser")
-SET(MC_EDJ_NAME "${MC_PREFIX}/shared/trusted/music-chooser.edj")
+SET(IMAGES_DIR "${MC_PREFIX}/res/edje/music-chooser")
+SET(MC_EDJ_NAME "${MC_PREFIX}/res/edje/music-chooser.edj")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DIMAGES_DIR=\"${IMAGES_DIR}\"")
 ADD_DEFINITIONS("-DMC_EDJ_NAME=\"${MC_EDJ_NAME}\"")
@@ -80,7 +80,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} music-chooser.edj)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 INSTALL(DIRECTORY DESTINATION ${DATADIR})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edje/layout/music-chooser.edj DESTINATION ${MC_PREFIX}/shared/trusted)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edje/layout/music-chooser.edj DESTINATION ${MC_PREFIX}/res/edje)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.music-chooser.xml DESTINATION ${SHARE_DIR}/packages)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/music-chooser.png DESTINATION ${CMAKE_DESKTOP_ICON_DIR})
 

diff --git a/music-chooser/src/include/music-chooser.h b/music-chooser/src/include/music-chooser.h
index b383a1e9563cf3de1d99248f6c2a36e32db6c823..a0133a9bbfa42b2878d12576630fe86be973334c 100755 (executable)
--- a/music-chooser/src/include/music-chooser.h
+++ b/music-chooser/src/include/music-chooser.h
@@ -35,13 +35,11 @@
 
 #define ICON_SIZE 64*elm_config_scale_get()
 
-#define PKGNAME "music-chooser"
 #define DOMAIN_NAME "org.tizen.music-chooser"
-//#define LOCALE_DIR PREFIX"/res/locale"
-#define LOCALE_DIR  "/usr/apps/org.tizen.music-chooser/res/locale"
-#define IMAGE_EDJ_NAME "/usr/apps/org.tizen.music-lite/res/edje/mp-images.edj"
+#define LOCALE_DIR  "locale"
+#define IMAGE_EDJ_NAME "mp-images.edj"
 #define SYS_DOMAIN_NAME "sys_string"
-#define MC_EDJ_FILE            "/usr/apps/org.tizen.music-chooser/shared/trusted/music-chooser.edj"
+#define MC_EDJ_FILE            "music-chooser.edj"
 
 #define _EDJ(o)                        elm_layout_edje_get(o)
 #define GET_STR(s)                     dgettext(DOMAIN_NAME, s)

diff --git a/music-chooser/src/mc-common.c b/music-chooser/src/mc-common.c
index 10d8a5a09d1533cc8a3cdb061f4ec589304d9030..1dd0ae6748d61d49691df50bb6a40bd6566e0362 100755 (executable)
--- a/music-chooser/src/mc-common.c
+++ b/music-chooser/src/mc-common.c
@@ -57,7 +57,14 @@ void mc_common_push_track_view_by_group_name(void *data, int track_type, const c
 
        ad->track_type = track_type;
 
-       Evas_Object *navi_layout = mc_common_load_edj(ad->navi_bar, MC_EDJ_FILE, "view_layout_tabbar");
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       if (path == NULL) {
+               return;
+       }
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
+       Evas_Object *navi_layout = mc_common_load_edj(ad->navi_bar, mc_edj_path, "view_layout_tabbar");
        g_navi_it = elm_naviframe_top_item_get(ad->navi_bar);
 //     g_ly = elm_object_item_part_content_get(g_navi_it, "elm.swallow.content");
        tabbar = _create_tabbar(ad->navi_bar, ad);
@@ -534,8 +541,13 @@ Evas_Object *mc_common_create_processing_popup(void *data)
 
        popup = elm_popup_add(ad->base_layout);
        //eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       MP_CHECK_NULL(path);
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
        Evas_Object *layout = elm_layout_add(popup);
-       elm_layout_file_set(layout, MC_EDJ_FILE, "popup_processingview_1button");
+       elm_layout_file_set(layout, mc_edj_path, "popup_processingview_1button");
        /*create circle progressbar*/
 
        progressbar = elm_progressbar_add(popup);

diff --git a/music-chooser/src/mc-group-list.c b/music-chooser/src/mc-group-list.c
index 8585cae683abd988b9c9c9095e1adf9cd1d7e9d8..5ac63b4bc7db724199010ac496fdc2d0b29825d8 100644 (file)
--- a/music-chooser/src/mc-group-list.c
+++ b/music-chooser/src/mc-group-list.c
@@ -172,7 +172,12 @@ Evas_Object *mc_group_list_create(Evas_Object *parent, struct app_data *ad, Elm_
        MP_CHECK_NULL(parent);
        MP_CHECK_NULL(ad);
 
-       layout = mc_common_load_edj(parent, MC_EDJ_FILE, "list_layout");
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       MP_CHECK_NULL(path);
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
+       layout = mc_common_load_edj(parent, mc_edj_path, "list_layout");
        MP_CHECK_NULL(layout);
 
        ld = calloc(1, sizeof(group_list_data_t));

diff --git a/music-chooser/src/mc-group-play-list.c b/music-chooser/src/mc-group-play-list.c
index 957f47966f0aca0a394751d7752fc3e1e0fffc47..7e02b25bcbcb0377dc9ca123e11a71674d8121c5 100644 (file)
--- a/music-chooser/src/mc-group-play-list.c
+++ b/music-chooser/src/mc-group-play-list.c
@@ -325,7 +325,14 @@ int mc_group_play_list_update(Evas_Object *list, Elm_Object_Item *navi_it)
        Evas_Object *select_btn = elm_button_add(ad->navi_bar);
        elm_object_style_set(select_btn, "naviframe/title_icon");
        ic = elm_icon_add(ad->navi_bar);
-       elm_image_file_set(ic, IMAGE_EDJ_NAME, "00_icon_edit.png");
+
+       char image_path[1024] = {0};
+       char *path = app_get_resource_path();
+       MP_CHECK_NULL(path);
+       snprintf(image_path, 1024, "%s%s/%s", path, "edje", IMAGE_EDJ_NAME);
+       elm_image_file_set(ic, image_path, "00_icon_edit.png");
+       free(path);
+
        evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
        elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
        elm_object_part_content_set(select_btn, "icon", ic);

diff --git a/music-chooser/src/mc-library-view.c b/music-chooser/src/mc-library-view.c
index 921cbcf213630c44d0c82e72f03de55434640c5b..c448daf6dc0d3b7bd92cc3311387eaa652a6d11c 100644 (file)
--- a/music-chooser/src/mc-library-view.c
+++ b/music-chooser/src/mc-library-view.c
@@ -182,7 +182,12 @@ Evas_Object *_create_tabbar(Evas_Object *parent, struct app_data *ad)
        elm_toolbar_transverse_expanded_set(obj, EINA_TRUE);
        elm_toolbar_select_mode_set(obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
-       elm_theme_extension_add(NULL, MC_EDJ_FILE);
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       MP_CHECK_NULL(path);
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
+       elm_theme_extension_add(NULL, mc_edj_path);
        elm_object_style_set(obj, "scroll/tabbar");
 //     elm_object_style_set(obj, "tabbar/item_with_title");
 
@@ -248,7 +253,14 @@ mc_library_view_create(struct app_data *ad)
        } else {
                //g_ly = elm_layout_add(ad->navi_bar);
                //elm_layout_theme_set(g_ly, "layout", "application", "default");
-               g_ly = mc_common_load_edj(ad->navi_bar, MC_EDJ_FILE, "view_layout_tabbar");
+               char mc_edj_path[1024] = {0};
+               char *path = app_get_resource_path();
+               if (path == NULL) {
+                       return;
+               }
+               snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+               free(path);
+               g_ly = mc_common_load_edj(ad->navi_bar, mc_edj_path, "view_layout_tabbar");
                g_navi_it = elm_naviframe_item_push(ad->navi_bar, NULL, NULL, NULL, g_ly, NULL);
 #if  0
                Evas_Object *search_btn = NULL;
@@ -264,7 +276,7 @@ mc_library_view_create(struct app_data *ad)
 #ifdef MC_AUTO_RECOMMENDED
                if (ad->auto_recommended_show) {
                        elm_object_signal_emit(g_ly, "show.recommended", "*");
-                       Evas_Object *recommended_area = mc_common_load_edj(ad->navi_bar, MC_EDJ_FILE, "recommended_area");
+                       Evas_Object *recommended_area = mc_common_load_edj(ad->navi_bar, mc_edj_path, "recommended_area");
                        elm_object_part_content_set(g_ly, "recommended", recommended_area);
                        mc_common_obj_domain_translatable_part_text_set(recommended_area, "title_text", MC_TEXT_SET_AS_AUTO_RECOMMEND);
                        mc_common_obj_domain_translatable_part_text_set(recommended_area, "description_text", MC_TEXT_SET_AS_RECOMMENDED_TXT);
@@ -280,7 +292,6 @@ mc_library_view_create(struct app_data *ad)
 #endif
        }
 
-
        mc_common_item_domain_text_translate(g_navi_it, "elm.text.title", MC_TEXT_SELECT);
        elm_naviframe_item_pop_cb_set(g_navi_it, mc_quit_cb, ad);
        endfunc;

diff --git a/music-chooser/src/mc-search-list.c b/music-chooser/src/mc-search-list.c
index 039f319bb603eed8fda5e03d33c241c4c273da83..1cc736ef1adcb83b14c26e281f98bc70c8c79929 100644 (file)
--- a/music-chooser/src/mc-search-list.c
+++ b/music-chooser/src/mc-search-list.c
@@ -41,7 +41,12 @@ _mc_search_list_no_content_add(void *data)
        evas_object_size_hint_weight_set(no_contents, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(no_contents, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       elm_layout_file_set(no_contents, MC_EDJ_FILE, "no_result");
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       MP_CHECK_NULL(path);
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
+       elm_layout_file_set(no_contents, mc_edj_path, "no_result");
 
        if (list->genlist) {
                elm_box_unpack(list->box, list->genlist);
@@ -646,7 +651,12 @@ UgMpSearchList_t * mc_search_list_create(Evas_Object *parent, struct app_data *a
 
        list->ad = ad;
 
-       list->layout = mc_common_load_edj(parent, MC_EDJ_FILE, "list_layout");
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       MP_CHECK_NULL(path);
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
+       list->layout = mc_common_load_edj(parent, mc_edj_path, "list_layout");
        if (list->layout == NULL) {
                IF_FREE(list);
                return NULL;

diff --git a/music-chooser/src/mc-search-view.c b/music-chooser/src/mc-search-view.c
index d856dfca596e5f6fef0d7dbb9f22af195f30f10b..91da91f22e03b093790a39e69a97c1fff0b711c0 100644 (file)
--- a/music-chooser/src/mc-search-view.c
+++ b/music-chooser/src/mc-search-view.c
@@ -149,7 +149,14 @@ _mc_search_init(Evas_Object *parent, void *thiz)
 
        search_view_data_t *search = (search_view_data_t *)thiz;
 
-       Evas_Object *layout = mc_common_load_edj(parent, MC_EDJ_FILE, "view_layout");
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       if (path == NULL) {
+               return;
+       }
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
+       Evas_Object *layout = mc_common_load_edj(parent, mc_edj_path, "view_layout");
 
        search->layout = layout;
 

diff --git a/music-chooser/src/mc-track-list.c b/music-chooser/src/mc-track-list.c
index 1cab5c22b048041a5aecfbb6f09a53ad6b0d0113..b815f10e5cdf5fba72208a602d24c28fcb906049 100755 (executable)
--- a/music-chooser/src/mc-track-list.c
+++ b/music-chooser/src/mc-track-list.c
@@ -917,7 +917,12 @@ Evas_Object *mc_track_list_create(Evas_Object *parent, struct app_data *ad)
        MP_CHECK_NULL(parent);
        MP_CHECK_NULL(ad);
 
-       layout = mc_common_load_edj(parent, MC_EDJ_FILE, "list_layout");
+       char mc_edj_path[1024] = {0};
+       char *path = app_get_resource_path();
+       MP_CHECK_NULL(path);
+       snprintf(mc_edj_path, 1024, "%s%s/%s", path, "edje", MC_EDJ_FILE);
+       free(path);
+       layout = mc_common_load_edj(parent, mc_edj_path, "list_layout");
        MP_CHECK_NULL(layout);
 
        ld = calloc(1, sizeof(track_list_data_t));

diff --git a/music-chooser/src/music-chooser.c b/music-chooser/src/music-chooser.c
index 1eeafabf075c3c0320357316e4b2ffd1e083e662..cf001af3084ffec5fc46c008b7db7da0fb7e8472 100755 (executable)
--- a/music-chooser/src/music-chooser.c
+++ b/music-chooser/src/music-chooser.c
@@ -212,7 +212,14 @@ mc_app_control(app_control_h app_control, void* data)
 
        app_control_clone(&ad->service, app_control);
 
-       bindtextdomain(DOMAIN_NAME, LOCALE_DIR);
+       char locale_path[1024] = {0};
+       char *path = app_get_resource_path();
+       if (path == NULL) {
+               return;
+       }
+       snprintf(locale_path, 1024, "%s%s", path, LOCALE_DIR);
+       bindtextdomain(DOMAIN_NAME, locale_path);
+       free(path);
 
        mp_media_info_connect();
        _parse_service(ad, app_control);

diff --git a/packaging/org.tizen.music-player.spec b/packaging/org.tizen.music-player.spec
index 9ff015e7b17e51dbbe5d30b78944b3f29e1949ad..3228157eb9e19052fa89ce44e2fba659af517895 100755 (executable)
--- a/packaging/org.tizen.music-player.spec
+++ b/packaging/org.tizen.music-player.spec
@@ -201,7 +201,7 @@ fi
 %{MC_PREFIX}/res/locale/*/LC_MESSAGES/*.mo
 %defattr(-,root,root,-)
 %{MC_PREFIX}/bin/*
-%{MC_PREFIX}/shared/trusted/music-chooser.edj
+%{MC_PREFIX}/res/edje/music-chooser.edj
 %{TZ_SYS_RO_ICONS}/default/small/music-chooser.png
 
 #END_START_PUBLIC_REMOVED_STRING