[TM-147] track,album and artist issue resolved

Change-Id: Ia7234c8953a157d12467a7213e669bb93bdebd5f
Signed-off-by: Shubham Kumar <shubham.srib@samsung.com>

diff --git a/music-chooser/layout/genlist_macro.edc b/music-chooser/layout/genlist_macro.edc
index aa0804508420c5bc94828625e5239d6c9b6755bb..a67f3d99e04b635049fa793e9d78a0ba0d9eeaf0 100644 (file)
--- a/music-chooser/layout/genlist_macro.edc
+++ b/music-chooser/layout/genlist_macro.edc
@@ -17,6 +17,9 @@
 
 #define GENLIST_NAME(NAME) \
       name: "elm/genlist/item/"NAME; \
+      alias: "elm/genlist/item_compress/"NAME; \
+      alias: "elm/genlist/tree/"NAME; \
+      alias: "elm/genlist/tree_compress/"NAME;
 
 
 //**************************************************************************//

diff --git a/res/edje/layout/genlist/genlist_macro.edc b/res/edje/layout/genlist/genlist_macro.edc
index c541a4c92e942ba3b1764fcf4f0eb41a93ee0de5..2c79d11d1e16ee9eee296bc5159b2204367184ce 100644 (file)
--- a/res/edje/layout/genlist/genlist_macro.edc
+++ b/res/edje/layout/genlist/genlist_macro.edc
@@ -17,6 +17,9 @@
 
 #define GENLIST_NAME(NAME) \
       name: "elm/genlist/item/"NAME; \
+      alias: "elm/genlist/item_compress/"NAME; \
+      alias: "elm/genlist/tree/"NAME; \
+      alias: "elm/genlist/tree_compress/"NAME;
 
 
 //**************************************************************************//

diff --git a/res/edje/layout/genlist/genlist_normal.edc b/res/edje/layout/genlist/genlist_normal.edc
index 2d89463a2964cb37b9a28ed2703a387cb67c7001..ad479eec2e2315086c732fc5615ad74f34de50e9 100755 (executable)
--- a/res/edje/layout/genlist/genlist_normal.edc
+++ b/res/edje/layout/genlist/genlist_normal.edc
@@ -29,7 +29,7 @@
 #define GENLIST_LITE_PAUSE_ICON  "lite/play_list_control_pause.png"
 #define GENLIST_LITE_PLAY_ICON   "lite/play_list_control_play.png"
 
-group {name : "elm/genlist/item/music/album_detail/default";
+group { GENLIST_NAME("music/album_detail/default")
    data.item: "texts" "elm.text.main.top elm.text.sub.bottom elm.text.main.shuffle";
    data.item: "contents" "elm.icon.1";
    parts {

diff --git a/src/widget/mp-album-detail-list.c b/src/widget/mp-album-detail-list.c
index 5af3fd5a924a83e589ef7eef2a3231c4bf41c192..79615fa578b20d28bd3c5f8ef12aebbd5d5677a8 100755 (executable)
--- a/src/widget/mp-album-detail-list.c
+++ b/src/widget/mp-album-detail-list.c
@@ -80,7 +80,7 @@ _mp_album_detail_list_label_get(void *data, Evas_Object * obj, const char *part)
 
        static char result[DEF_STR_LEN + 1] = { 0, };
 
-       if (!strcmp(part, "elm.text.main.left")) {
+       if (!strcmp(part, "elm.text")) {
                char *title = NULL;
                bool match = mp_common_track_is_current(track, (MpList_t *)list);
 
@@ -115,7 +115,7 @@ _mp_album_detail_list_label_get(void *data, Evas_Object * obj, const char *part)
                return markup;
        }
        if (!list->edit_mode) {
-               if (!strcmp(part, "elm.text.sub.right")) {
+               if (!strcmp(part, "elm.text.end")) {
                        int duration;
                        char time[16] = "";
                        bool match = mp_common_track_is_current(track, (MpList_t *)list);
@@ -280,9 +280,9 @@ _mp_album_detail_list_album_text_get(void *data, Evas_Object *obj, const char *p
        MpAlbumDetailList_t *list = evas_object_data_get(obj, "list_data");
        MP_CHECK_NULL(list);
 
-       if (!strcmp(part, "elm.text.main.left.top")) {
+       if (!strcmp(part, "elm.text")) {
                return g_strdup(elm_entry_utf8_to_markup(list->artist));
-       } else if (!strcmp(part, "elm.text.sub.left.bottom")) {
+       } else if (!strcmp(part, "elm.text.end")) {
                char *text = NULL;
                char *tmp = NULL;
                char time[16] = "";
@@ -313,7 +313,7 @@ _mp_album_detail_list_shuffle_text_get(void *data, Evas_Object *obj, const char
        char *markup = NULL;
        static char result[DEF_STR_LEN + 1] = { 0, };
 
-       if (!strcmp(part, "elm.text.main.left")) {
+       if (!strcmp(part, "elm.text")) {
                MpAlbumDetailList_t *list = evas_object_data_get(obj, "list_data");
                MP_CHECK_NULL(list);
 
@@ -340,7 +340,7 @@ _mp_album_detail_list_shuffle_text_get(void *data, Evas_Object *obj, const char
 Evas_Object *
 _mp_album_detail_list_album_icon_get(void *data, Evas_Object * obj, const char *part)
 {
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                MpAlbumDetailList_t *list = evas_object_data_get(obj, "list_data");
                MP_CHECK_NULL(list);
 
@@ -361,7 +361,7 @@ _mp_album_detail_list_album_icon_get(void *data, Evas_Object * obj, const char *
 Evas_Object *
 _mp_album_detail_list_shuffle_icon_get(void *data, Evas_Object * obj, const char *part)
 {
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                Evas_Object *content = NULL;
                content = elm_layout_add(obj);
 
@@ -450,7 +450,7 @@ static void _mp_album_detail_list_append_album_item(MpAlbumDetailList_t *list)
 
        list->itc_album = elm_genlist_item_class_new();
        MP_CHECK(list->itc_album);
-       list->itc_album->item_style = "2line.top";//"music/1text.2icon.3";//"music/3text.1icon.2"
+       list->itc_album->item_style = "type1";//"music/1text.2icon.3";//"music/3text.1icon.2"
        list->itc_album->func.text_get = _mp_album_detail_list_album_text_get;
        list->itc_album->decorate_all_item_style = NULL;
        list->itc_album->func.content_get = _mp_album_detail_list_album_icon_get;
@@ -484,7 +484,7 @@ void mp_album_detail_list_show_shuffle(void *thiz, bool show)
                list->itc_shuffle = elm_genlist_item_class_new();
                MP_CHECK(list->itc_shuffle);
                //list->itc_shuffle->item_style = "music/1line";
-               list->itc_shuffle->item_style = "1line";
+               list->itc_shuffle->item_style = "default";
                list->itc_shuffle->func.text_get = _mp_album_detail_list_shuffle_text_get;
                list->itc_shuffle->decorate_all_item_style = NULL;
                list->itc_shuffle->func.content_get = _mp_album_detail_list_shuffle_icon_get;
@@ -779,22 +779,18 @@ static void _mp_album_detail_list_update(void *thiz)
                if (!list->itc) {
                        list->itc = elm_genlist_item_class_new();
                        if (list->itc) {
-                               list->itc->item_style = "1line.2";//"music/2text";
-                               //list->itc->decorate_all_item_style = "decorate/edit_default";//edit_default
+                               list->itc->item_style = "type1";
                                list->itc->func.text_get = _mp_album_detail_list_label_get;
                                list->itc->func.content_get = _mp_album_detail_list_icon_get;
                                list->itc->func.del = _mp_album_detail_list_item_del_cb;
                        }
                }
 
-               //evas_object_smart_callback_add(list->genlist, "longpressed", _mp_album_detail_list_item_longpressed_cb, list);
                evas_object_smart_callback_add(list->genlist, "scroll,drag,start", list->drag_start_cb, list);
                evas_object_smart_callback_add(list->genlist, "scroll,drag,stop", list->drag_stop_cb, list);
                evas_object_smart_callback_add(list->genlist, "highlighted", _mp_album_detail_list_item_highlighted, list);
                evas_object_smart_callback_add(list->genlist, "unhighlighted", _mp_album_detail_list_item_unhighlighted, list);
 
-//             mp_list_bottom_counter_item_append((MpList_t *)list);
-
                PROFILE_OUT("elm_genlist_add");
                /* load list */
                PROFILE_IN("_mp_album_detail_list_load_list");

diff --git a/src/widget/mp-album-list.c b/src/widget/mp-album-list.c
index bf9d6cc8589ca73b56283df2801adc07d16ccf00..feefb927d99e8098076f0c5cde7a14f7851ba3b1 100755 (executable)
--- a/src/widget/mp-album-list.c
+++ b/src/widget/mp-album-list.c
@@ -73,7 +73,7 @@ _mp_album_list_label_get(void *data, Evas_Object * obj, const char *part)
 
        mp_retv_if(svc_item == NULL, NULL);
 
-       if (!strcmp(part, "elm.text.main.left.top")) {
+       if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
@@ -82,7 +82,7 @@ _mp_album_list_label_get(void *data, Evas_Object * obj, const char *part)
 
                return elm_entry_utf8_to_markup(name);
 
-       } else if (!strcmp(part, "elm.text.sub.left.bottom")) {
+       } else if (!strcmp(part, "elm.text.sub")) {
                ret = mp_media_info_group_get_sub_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
@@ -111,7 +111,7 @@ _mp_album_list_icon_get(void *data, Evas_Object * obj, const char *part)
        Evas_Object *content = NULL;
        content = elm_layout_add(obj);
 
-       if (!strcmp(part, "elm.icon.1") || !strcmp(part, "elm.swallow.icon")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                char *thumb_name = NULL;
                mp_media_info_group_get_thumbnail_path(svc_item, &thumb_name);
                int w, h;
@@ -536,25 +536,12 @@ _mp_album_list_genlist_create(MpAlbumList_t *list)
        if (!list->itc) {
                list->itc = elm_genlist_item_class_new();
                MP_CHECK(list->itc);
-               //list->itc->item_style = "music/2line.top";
-               list->itc->item_style = "2line.top";
-               //list->itc->decorate_all_item_style = "musiclist/edit_default";
-               //list->itc->decorate_item_style = group_slide_style;
+               list->itc->item_style = "type1";
                list->itc->func.text_get = _mp_album_list_label_get;
                list->itc->func.content_get = _mp_album_list_icon_get;
                list->itc->func.del = _mp_album_list_item_del_cb;
        }
 
-       /*
-       evas_object_smart_callback_add(list->genlist, "drag,start,left", list->flick_left_cb, NULL);
-       evas_object_smart_callback_add(list->genlist, "drag,start,right", list->flick_right_cb, NULL);
-       evas_object_smart_callback_add(list->genlist, "drag,stop", list->flick_stop_cb, NULL);
-
-       evas_object_smart_callback_add(list->genlist, "drag,start,right", list->mode_right_cb, NULL);
-       evas_object_smart_callback_add(list->genlist, "drag,start,left", list->mode_left_cb, NULL);
-       evas_object_smart_callback_add(list->genlist, "drag,start,up", list->mode_cancel_cb, NULL);
-       evas_object_smart_callback_add(list->genlist, "drag,start,down", list->mode_cancel_cb, NULL);
-              */
        endfunc;
 }
 

diff --git a/src/widget/mp-artist-detail-list.c b/src/widget/mp-artist-detail-list.c
index c5f9df61d397adacff93a8372a23167a80b15d4a..cd839fdf5ff74f376795973eb0fe30366dc0c506 100755 (executable)
--- a/src/widget/mp-artist-detail-list.c
+++ b/src/widget/mp-artist-detail-list.c
@@ -41,7 +41,7 @@ _mp_artist_detail_list_album_label_get(void *data, Evas_Object * obj, const char
 
        mp_retv_if(svc_item == NULL, NULL);
 
-       if (!g_strcmp0(part, "elm.text.main.left")) {
+       if (!g_strcmp0(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
@@ -122,7 +122,7 @@ _mp_artist_detail_list_album_icon_get(void *data, Evas_Object * obj, const char
        MpArtistDetailList_t *list = evas_object_data_get(obj, "list_data");
        MP_CHECK_NULL(list);
 
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                content = elm_layout_add(obj);
 
                char *thumb_name = NULL;
@@ -186,7 +186,7 @@ _mp_artist_detail_list_track_label_get(void *data, Evas_Object * obj, const char
 
        static char result[DEF_STR_LEN + 1] = { 0, };
 
-       if (!strcmp(part, "elm.text.main.left")) {
+       if (!strcmp(part, "elm.text")) {
 
                bool match = mp_common_track_is_current(track, (MpList_t *)list);
                char *title = NULL;
@@ -217,7 +217,7 @@ _mp_artist_detail_list_track_label_get(void *data, Evas_Object * obj, const char
                return markup;
        }
        if (!list->edit_mode) {
-               if (!strcmp(part, "elm.text.sub.right")) {
+               if (!strcmp(part, "elm.text.end")) {
                        int duration;
                        char time[16] = "";
                        bool match = mp_common_track_is_current(track, (MpList_t *)list);
@@ -481,7 +481,7 @@ _mp_artist_detail_list_shuffle_text_get(void *data, Evas_Object *obj, const char
        char *markup = NULL;
        static char result[DEF_STR_LEN + 1] = { 0, };
 
-       if (!strcmp(part, "elm.text.main.left")) {
+       if (!strcmp(part, "elm.text")) {
                MpArtistDetailList_t *list = evas_object_data_get(obj, "list_data");
                MP_CHECK_NULL(list);
 
@@ -507,7 +507,7 @@ _mp_artist_detail_list_shuffle_text_get(void *data, Evas_Object *obj, const char
 Evas_Object *
 _mp_artist_detail_list_shuffle_icon_get(void *data, Evas_Object * obj, const char *part)
 {
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                Evas_Object *content = NULL;
                content = elm_layout_add(obj);
 
@@ -584,7 +584,7 @@ static void _mp_artist_detail_list_append_shuffle_item(MpArtistDetailList_t *lis
                return;
        }
        //list->itc_shuffle->item_style = "music/1line";//"music/1text.2icon.3";//"music/3text.1icon.2"
-       list->itc_shuffle->item_style = "1line";//"music/1text.2icon.3";//"music/3text.1icon.2"
+       list->itc_shuffle->item_style = "default";//"music/1text.2icon.3";//"music/3text.1icon.2"
        list->itc_shuffle->func.text_get = _mp_artist_detail_list_shuffle_text_get;
        list->itc_shuffle->decorate_all_item_style = NULL;
        list->itc_shuffle->func.content_get = _mp_artist_detail_list_shuffle_icon_get;
@@ -914,18 +914,14 @@ void _mp_artist_detail_list_update(void *thiz)
 #endif
                list->itc_album = elm_genlist_item_class_new();
                if (list->itc_album) {
-                       list->itc_album->item_style = "1line";//"artist/groupindex.icon";
-                       //list->itc_album->item_style = "music/1line";//"artist/groupindex.icon";
-                       //list->itc_album->decorate_all_item_style = "artistdetaillist/edit_default";
+                       list->itc_album->item_style = "default";
                        list->itc_album->func.text_get = _mp_artist_detail_list_album_label_get;
                        list->itc_album->func.content_get = _mp_artist_detail_list_album_icon_get;
                        list->itc_album->func.del = _mp_artist_detail_list_item_del_cb;
 
                        list->itc_track = elm_genlist_item_class_new();
                        if (list->itc_track) {
-                               list->itc_track->item_style = "1line.2";//"music/2text";
-                               //list->itc_track->decorate_all_item_style = "musiclist/edit_default";
-                               //list->itc_track->decorate_item_style = group_slide_style;
+                               list->itc_track->item_style = "type1";
                                list->itc_track->func.text_get = _mp_artist_detail_list_track_label_get;
                                list->itc_track->func.content_get = _mp_artist_detail_list_track_icon_get;
                                list->itc_track->func.del = _mp_artist_detail_list_item_del_cb;
@@ -940,14 +936,11 @@ void _mp_artist_detail_list_update(void *thiz)
                evas_object_smart_callback_add(list->genlist, "drag,start,up", list->mode_cancel_cb, NULL);
                evas_object_smart_callback_add(list->genlist, "drag,start,down", list->mode_cancel_cb, NULL);
 
-               //evas_object_smart_callback_add(list->genlist, "longpressed", _mp_artist_list_item_longpressed_cb, list);
                evas_object_smart_callback_add(list->genlist, "scroll,drag,start", list->drag_start_cb, list);
                evas_object_smart_callback_add(list->genlist, "scroll,drag,stop", list->drag_stop_cb, list);
                evas_object_smart_callback_add(list->genlist, "highlighted", _mp_artist_detail_list_item_highlighted, list);
                evas_object_smart_callback_add(list->genlist, "unhighlighted", _mp_artist_detail_list_item_unhighlighted, list);
 
-//             mp_list_bottom_counter_item_append((MpList_t *)list);
-
                /* load list */
                _mp_artist_detail_list_load_list(thiz, count_album);
 

diff --git a/src/widget/mp-artist-list.c b/src/widget/mp-artist-list.c
index 4f75afc8101a2dd64a2de09c7054e00216a5d8f1..41c7b3d489136df0e5a33777da7fd2124793d6e8 100755 (executable)
--- a/src/widget/mp-artist-list.c
+++ b/src/widget/mp-artist-list.c
@@ -74,14 +74,14 @@ _mp_artist_list_label_get(void *data, Evas_Object *obj, const char *part)
        mp_media_info_h svc_item = (item->handle);
        mp_retv_if(svc_item == NULL, NULL);
 
-       if (!strcmp(part, "elm.text.main.left.top") || !strcmp(part, "elm.slide.text.1") || !strcmp(part, "elm.text")) {
+       if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
                }
                return elm_entry_utf8_to_markup(name);
-       } else if (!strcmp(part, "elm.text.sub.left.bottom")) {
+       } else if (!strcmp(part, "elm.text.sub")) {
                char **album_thumbs = NULL;
                int album_count = 0;
                int song_count = 0;
@@ -571,10 +571,7 @@ _mp_artist_list_genlist_create(MpArtistList_t *list)
                        ERROR_TRACE("Unable to create artist list genlist");
                        return;
                }
-               /*list->itc->item_style = "music/2line.top";*/
-               list->itc->item_style = "2line.top";
-               /*list->itc->decorate_all_item_style = "musiclist/edit_default";
-               list->itc->decorate_item_style = group_slide_style;*/
+               list->itc->item_style = "type1";
                list->itc->func.text_get = _mp_artist_list_label_get;
                list->itc->func.content_get = _mp_artist_list_icon_get;
                list->itc->func.del = _mp_artist_list_item_del_cb;
@@ -602,9 +599,6 @@ _mp_artist_list_set_grid_style(MpArtistList_t *list)
 
        MP_CHECK(list->gengrid_itc);
 
-       /*if (landscape)
-               list->gengrid_itc->item_style = "music/artist_grid";
-       else*/
        list->gengrid_itc->item_style = "music/artist_grid";
 
        double scale = elm_config_scale_get();

diff --git a/src/widget/mp-list.c b/src/widget/mp-list.c
index ca83741c68257f3576be3f2963e614cb4316981a..a5ef00232dfdcb59d69b65d910ab6945dced092e 100755 (executable)
--- a/src/widget/mp-list.c
+++ b/src/widget/mp-list.c
@@ -837,7 +837,7 @@ static char *_mp_list_bottom_counter_item_text_get_cb(void *data, Evas_Object *o
        MpList_t *list = (MpList_t *)evas_object_data_get(obj, "list_data");
        MP_CHECK_NULL(list);
        MP_CHECK_NULL(list->bottom_counter_text_get_cb);
-       if (!strcmp(part, "elm.text")) {
+       if (!strcmp(part, "elm.text.end")) {
                return list->bottom_counter_text_get_cb(list);
        } else {
                return NULL;
@@ -868,7 +868,7 @@ Elm_Object_Item *mp_list_bottom_counter_item_append(MpList_t *list)
        evas_object_data_set(list->genlist, "list_data", list);
 
        static Elm_Genlist_Item_Class itc = { 0, };
-       itc.item_style = "music/1text/bottom_counter";
+       itc.item_style = "group_index";
        itc.func.text_get = _mp_list_bottom_counter_item_text_get_cb;
        itc.func.del = _mp_list_bottom_counter_item_del_cb;
 

diff --git a/src/widget/mp-track-list.c b/src/widget/mp-track-list.c
index ebcdd00955d813f7a1da62c9a54714eefe1869bf..7b781994580af2e8f96151e62963cb035ed8a1f2 100644 (file)
--- a/src/widget/mp-track-list.c
+++ b/src/widget/mp-track-list.c
@@ -49,7 +49,7 @@ _mp_track_list_label_get(void *data, Evas_Object * obj, const char *part)
        mp_media_info_h track = (mp_media_info_h)(item->handle);
        mp_retvm_if(!track, NULL, "data is null");
 
-       if ((!strcmp(part, "elm.text.main.left.top")) || (!strcmp(part, "elm.text.sub.left.bottom"))) {
+       if (!strcmp(part, "elm.text") || !strcmp(part, "elm.text.sub")) {
                MpTrackList_t *list = evas_object_data_get(obj, "list_data");
                MP_CHECK_NULL(list);
 
@@ -59,7 +59,7 @@ _mp_track_list_label_get(void *data, Evas_Object * obj, const char *part)
 
                char *title = NULL;
 
-               if (!strcmp(part, "elm.text.main.left.top")) {
+               if (!strcmp(part, "elm.text")) {
 
                        if (list->track_type == MP_TRACK_BY_FOLDER) {
                                mp_media_info_get_display_name(track, &title);
@@ -145,7 +145,7 @@ _mp_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
        char *uri = NULL;
        mp_media_info_get_file_path(track, &uri);
 
-       Evas_Object *part_content = elm_object_item_part_content_get(item->it, "elm.icon.1");
+       Evas_Object *part_content = elm_object_item_part_content_get(item->it, "elm.swallow.icon");
        if (part_content) {
                elm_object_signal_emit(part_content, "show_default", "*");
        }
@@ -172,7 +172,7 @@ _mp_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
                }
        }
 
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                char *thumbpath = NULL;
                Evas_Object *icon;
 
@@ -655,7 +655,7 @@ _mp_track_list_shuffle_text_get(void *data, Evas_Object *obj, const char *part)
 {
        char *markup = NULL;
        static char result[DEF_STR_LEN + 1] = { 0, };
-       if (!strcmp(part, "elm.text.main.left")) {
+       if (!strcmp(part, "elm.text")) {
                MpTrackList_t *list = evas_object_data_get(obj, "list_data");
                MP_CHECK_NULL(list);
 
@@ -682,7 +682,7 @@ _mp_track_list_shuffle_icon_get(void *data, Evas_Object * obj, const char *part)
        Evas_Object *content = NULL;
        content = elm_layout_add(obj);
 
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                Evas_Object *icon;
                icon = mp_util_create_image(obj, IMAGE_EDJ_NAME, MP_LITE_SHUFFLE_ICON, MP_LIST_SHUFFLE_ICON_SIZE, MP_LIST_SHUFFLE_ICON_SIZE);
                evas_object_color_set(icon, 21, 108, 148, 255);
@@ -732,7 +732,7 @@ static void _mp_track_list_append_shuffle_item(MpTrackList_t *list)
                list->itc_shuffle = elm_genlist_item_class_new();
                MP_CHECK(list->itc_shuffle);
                //list->itc_shuffle->item_style = "music/1line";//"music/3text.1icon.2"
-               list->itc_shuffle->item_style = "1line";//"music/3text.1icon.2"
+               list->itc_shuffle->item_style = "default";//"music/3text.1icon.2"
                list->itc_shuffle->func.text_get = _mp_track_list_shuffle_text_get;
                list->itc_shuffle->decorate_all_item_style = NULL;
                list->itc_shuffle->func.content_get = _mp_track_list_shuffle_icon_get;
@@ -1144,10 +1144,7 @@ static void _mp_track_list_update(void *thiz)
                if (!list->itc) {
                        list->itc = elm_genlist_item_class_new();
                        if (list->itc) {
-                               list->itc->item_style = "2line.top";
-                               //list->itc->item_style = "music/2line.top";//"music/tracklist/2text.1icon.4";//"music/3text.1icon.2"
-                               //list->itc->decorate_item_style = "NULL";
-                               //list->itc->decorate_all_item_style = "decorate/edit_default";//edit_default
+                               list->itc->item_style = "type1";
                                list->itc->func.text_get = _mp_track_list_label_get;
                                list->itc->func.content_get = _mp_track_list_icon_get;
                                list->itc->func.del = _mp_track_list_item_del_cb;