Removed deprecated elm_genlist_decorate_mode_xxx API's

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

diff --git a/music-chooser/src/mc-group-play-list.c b/music-chooser/src/mc-group-play-list.c
index 9c3207e9f758d289f9bafca37785c8a1606ddb2b..1f5d088b50c055137eb3d99e95d6bf1d290c7f5e 100644 (file)
--- a/music-chooser/src/mc-group-play-list.c
+++ b/music-chooser/src/mc-group-play-list.c
@@ -65,8 +65,7 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
 
        mp_media_info_h media = it_data->media;
 
-       if (!strcmp(part, "elm.icon"))
-       {
+       if (!strcmp(part, "elm.icon")) {
                content = elm_bg_add(obj);
                elm_bg_load_size_set(content, ICON_SIZE, ICON_SIZE);
 
@@ -78,19 +77,6 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
                        elm_bg_file_set(content, DEFAULT_THUMBNAIL, NULL);
        }
 
-       if (elm_genlist_decorate_mode_get(obj) )
-       {                       // if edit mode
-               if (!strcmp(part, "elm.edit.icon.1"))
-               {               // swallow checkbox or radio button
-                       content = elm_check_add(obj);
-                       elm_check_state_pointer_set(content, &it_data->checked);
-                       elm_object_style_set(content, "default/genlist");
-                       evas_object_repeat_events_set(content, EINA_TRUE);
-                       evas_object_propagate_events_set(content, FALSE);
-                       return content;
-               }
-       }
-
        return content;
 }
 
@@ -171,22 +157,6 @@ static void _gl_sel_cb(void *data, Evas_Object *obj, void *event_info)
        list_item_data_t *it_data = elm_object_item_data_get(event_info);
        MP_CHECK(it_data);
 
-       if (elm_genlist_decorate_mode_get(obj) )
-       {
-               it_data->checked = !it_data->checked;
-               elm_genlist_item_fields_update(event_info, "elm.edit.icon.1", ELM_GENLIST_ITEM_FIELD_CONTENT);
-
-               if (ld->btn_done)
-               {
-                       if (_get_select_count(ld))
-                               elm_object_item_disabled_set(ld->btn_done, false);
-                       else
-                               elm_object_item_disabled_set(ld->btn_done, true);
-               }
-               DEBUG_TRACE("_get_select_count = %d", _get_select_count(ld));
-               return;
-       }
-
        mp_media_info_h media = it_data->media;
        MP_CHECK(media);
        mp_media_info_get_file_path(media, &path);
@@ -395,8 +365,6 @@ int mc_group_play_list_update(Evas_Object *list, Elm_Object_Item *navi_it)
                                elm_genlist_item_append(content, &ld->itc, data, NULL, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, ld);
                        }
                }
-
-               elm_genlist_decorate_mode_set(content, true);
        }
        else
                content = mc_widget_no_content_add(list, NO_CONTENT_SONG);

diff --git a/music-chooser/src/mc-track-list.c b/music-chooser/src/mc-track-list.c
index 056c3336d16342835c946a75f53800794ba0a63e..8eca9569bbed092685dfd845cb7d7e73bedc5786 100755 (executable)
--- a/music-chooser/src/mc-track-list.c
+++ b/music-chooser/src/mc-track-list.c
@@ -1047,10 +1047,6 @@ int mc_track_list_update(Evas_Object *list, Elm_Object_Item *navi_it, Evas_Objec
                content = mc_widget_no_content_add(list, NO_CONTENT_SONG);
        }
 
-       if (ld->multiple || ld->single) {
-               elm_genlist_decorate_mode_set(content, true);
-       }
-
        elm_layout_content_set(list, "list_content", content);
        /*add index*/
 

diff --git a/src/widget/mp-album-detail-list.c b/src/widget/mp-album-detail-list.c
index 9aa71bdd77979776243d9089fcee0848b666e36f..4f7cf5185c8cd54ee6d1e658067743610ee7664b 100755 (executable)
--- a/src/widget/mp-album-detail-list.c
+++ b/src/widget/mp-album-detail-list.c
@@ -122,7 +122,7 @@ _mp_album_detail_list_label_get(void *data, Evas_Object * obj, const char *part)
                }
                return markup;
        }
-       if (elm_genlist_decorate_mode_get(obj) == false) {
+       if (!list->edit_mode) {
                if (!strcmp(part, "elm.text.sub.right")) {
                        int duration;
                        char time[16] = "";
@@ -167,25 +167,25 @@ _mp_album_detail_list_icon_get(void *data, Evas_Object * obj, const char *part)
        MpAlbumDetailList_t *list = evas_object_data_get(obj, "list_data");
        MP_CHECK_NULL(list);
 
-       if (elm_genlist_decorate_mode_get(obj) )
-       {                       // if edit mode
-                if (!strcmp(part, "elm.icon.2"))
-                {              // swallow checkbox or radio button
-                        Evas_Object *content = NULL;
-                        Evas_Object *icon = NULL;
-                        content = elm_layout_add(obj);
+       if (list->edit_mode) {
+               // if edit mode
+               if (!strcmp(part, "elm.icon.2")) {
+                       // swallow checkbox or radio button
+                       Evas_Object *content = NULL;
+                       Evas_Object *icon = NULL;
+                       content = elm_layout_add(obj);
 
-                        icon = elm_check_add(obj);
-                        elm_object_style_set(icon, "default");
+                       icon = elm_check_add(obj);
+                       elm_object_style_set(icon, "default");
                        evas_object_propagate_events_set(icon, EINA_FALSE);
                        evas_object_smart_callback_add(icon, "changed", mp_common_view_check_changed_cb, NULL);
-                        elm_check_state_pointer_set(icon, &item->checked);
+                       elm_check_state_pointer_set(icon, &item->checked);
 
-                        elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                        elm_layout_content_set(content, "elm.swallow.content", icon);
+                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
+                       elm_layout_content_set(content, "elm.swallow.content", icon);
 
-                        return content;
-                }
+                       return content;
+               }
        }
 
        return NULL;

diff --git a/src/widget/mp-album-list.c b/src/widget/mp-album-list.c
index 2c05a9a0ec65bba27444c4a129c3f6deb8735387..0100e2e7f809fc31a90847605f1ec18d9dc09432 100755 (executable)
--- a/src/widget/mp-album-list.c
+++ b/src/widget/mp-album-list.c
@@ -169,10 +169,10 @@ _mp_album_list_icon_get(void *data, Evas_Object * obj, const char *part)
        Evas_Object *check = NULL;
        DEBUG_TRACE("list->edit_mode = %d", list->edit_mode);
 
-       if (list->edit_mode)//(elm_genlist_decorate_mode_get(obj))
-       {                       // if edit mode
-               if (!strcmp(part, "elm.icon.2"))
-               {               // swallow checkbox or radio button
+       if (list->edit_mode) {
+               // if edit mode
+               if (!strcmp(part, "elm.icon.2")) {
+                       // swallow checkbox or radio button
                        check = elm_check_add(obj);
                        elm_object_style_set(check, "default");
                        evas_object_propagate_events_set(check, EINA_FALSE);

diff --git a/src/widget/mp-artist-detail-list.c b/src/widget/mp-artist-detail-list.c
index 90c19a8f01ae590b19306971ca73149dfc7a8c76..ddc66e0977dbe15f932c233b6f714e2a10044b59 100755 (executable)
--- a/src/widget/mp-artist-detail-list.c
+++ b/src/widget/mp-artist-detail-list.c
@@ -124,8 +124,11 @@ _mp_artist_detail_list_album_icon_get(void *data, Evas_Object * obj, const char
        MP_CHECK_NULL(item);
        mp_media_info_h svc_item = (item->handle);
        mp_retv_if (svc_item == NULL, NULL);
-        Evas_Object *content = NULL;
-        Evas_Object *icon = NULL;
+       Evas_Object *content = NULL;
+       Evas_Object *icon = NULL;
+
+       MpArtistDetailList_t *list = evas_object_data_get(obj, "list_data");
+       MP_CHECK_NULL(list);
 
        if (!strcmp(part, "elm.icon.1"))
        {
@@ -140,7 +143,7 @@ _mp_artist_detail_list_album_icon_get(void *data, Evas_Object * obj, const char
 
                return content;
        }
-        if (elm_genlist_decorate_mode_get(obj) ) {
+        if (list->edit_mode) {
                if (!strcmp(part, "elm.icon.2")) {
                        content = elm_layout_add(obj);
 
@@ -221,7 +224,7 @@ _mp_artist_detail_list_track_label_get(void *data, Evas_Object * obj, const char
 
                return markup;
        }
-       if (elm_genlist_decorate_mode_get(obj) == false) {
+       if (!list->edit_mode) {
                if (!strcmp(part, "elm.text.sub.right")) {
                        int duration;
                        char time[16] = "";
@@ -255,6 +258,9 @@ _mp_artist_detail_list_track_icon_get(void *data, Evas_Object * obj, const char
        MP_CHECK_NULL(item);
        mp_media_info_h track = item->handle;
        mp_retvm_if (!track, NULL, "data is null");
+
+       MpArtistDetailList_t *list = evas_object_data_get(obj, "list_data");
+       MP_CHECK_NULL(list);
 /*
        if (!strcmp(part, "elm.icon"))
        {
@@ -310,8 +316,8 @@ _mp_artist_detail_list_track_icon_get(void *data, Evas_Object * obj, const char
                return button;
        }
 
-       if (elm_genlist_decorate_mode_get(obj) )
-       {                       // if edit mode
+       if (list->edit_mode) {
+               // if edit mode
                DEBUG_TRACE("edit mode starts");
                if (!strcmp(part, "elm.icon.2")) {              // swallow checkbox or radio button
                        Evas_Object *content = NULL;
@@ -887,11 +893,9 @@ static void _mp_artist_detail_list_set_edit(void *thiz, bool edit)
                }
 
                mp_list_select_mode_set(list->genlist, ELM_OBJECT_SELECT_MODE_ALWAYS);
-               elm_genlist_decorate_mode_set(list->genlist, EINA_TRUE);
        }
        else
        {
-               elm_genlist_decorate_mode_set(list->genlist, EINA_FALSE);
                mp_list_select_mode_set(list->genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
 
                Elm_Object_Item *item = mp_list_first_item_get(list->genlist);

diff --git a/src/widget/mp-artist-list.c b/src/widget/mp-artist-list.c
index 982dd4cece55e7e1f8297bd59710b45b23c2f6c3..90cb24783ca2a571d746af003335d6a1b228e238 100755 (executable)
--- a/src/widget/mp-artist-list.c
+++ b/src/widget/mp-artist-list.c
@@ -190,7 +190,7 @@ _mp_artist_list_icon_get(void *data, Evas_Object *obj, const char *part)
        }
 
        Evas_Object *check = NULL;
-       if (elm_genlist_decorate_mode_get(obj)) {
+       if (list->edit_mode) {
                if (!strcmp(part, "elm.icon.2")) {
                        content = elm_layout_add(obj);
                        check = elm_check_add(obj);

diff --git a/src/widget/mp-folder-list.c b/src/widget/mp-folder-list.c
index 904e7447cdd62b6a35bb085ef52c9295da27c868..1c8926fd56b3a9cdc4e8626dbff20dc3a28c5d9b 100755 (executable)
--- a/src/widget/mp-folder-list.c
+++ b/src/widget/mp-folder-list.c
@@ -154,6 +154,9 @@ _mp_folder_list_icon_get(void *data, Evas_Object * obj, const char *part)
        Evas_Object *content = NULL;
        content = elm_layout_add(obj);
 
+       MpFolderList_t *list = evas_object_data_get(obj, "list_data");
+       MP_CHECK_NULL(list);
+
        const char *slide_part_play_all = "";
        if (item->group_type == MP_GROUP_BY_FOLDER)
                slide_part_play_all = "elm.slide.swallow.2";
@@ -244,7 +247,7 @@ _mp_folder_list_icon_get(void *data, Evas_Object * obj, const char *part)
 
        Evas_Object *check = NULL;
 
-       if (elm_genlist_decorate_mode_get(obj)) {                       // if edit mode
+       if (list->edit_mode) {                  // if edit mode
                if (!strcmp(part, "elm.icon.2")) {              // swallow checkbox or radio button
                        check = elm_check_add(obj);
                        elm_object_style_set(check, "genlist");
@@ -475,7 +478,6 @@ append_folder_items:
                                elm_check_state_set(layout_data->select_all_checkbox, false);
                }
 
-               elm_genlist_decorate_mode_set(layout_data->genlist, EINA_TRUE);
                elm_genlist_select_mode_set(layout_data->genlist, ELM_OBJECT_SELECT_MODE_ALWAYS);
        }
        else
@@ -485,7 +487,6 @@ append_folder_items:
                        evas_object_del(layout_data->select_all_layout);
                        layout_data->select_all_layout = NULL;
                }
-               elm_genlist_decorate_mode_set(layout_data->genlist, EINA_FALSE);
                elm_genlist_select_mode_set(layout_data->genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
        }
 

diff --git a/src/widget/mp-list.c b/src/widget/mp-list.c
index 14639c8a1bc686bc07b7ff3e22e73f32fb472271..4b4716d3e2a490039ba0cec0a71336a8d9952bcc 100755 (executable)
--- a/src/widget/mp-list.c
+++ b/src/widget/mp-list.c
@@ -58,7 +58,6 @@ _mp_list_gl_mode_left(void *data, Evas_Object * obj, void *event_info)
        MP_CHECK(elm_genlist_item_select_mode_get(event_info) != ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        //MP_CHECK(elm_genlist_item_select_mode_get(event_info) != ELM_OBJECT_SELECT_MODE_NONE);
        // disable sweep if edit mode.
-       MP_CHECK(elm_genlist_decorate_mode_get(obj) == EINA_FALSE);
        MP_CHECK(elm_genlist_item_flip_get(event_info) == EINA_FALSE);
        // Finish genlist sweep
        elm_genlist_item_decorate_mode_set(event_info, "slide", EINA_FALSE);
@@ -83,7 +82,6 @@ _mp_list_gl_mode_right(void *data, Evas_Object * obj, void *event_info)
        }
 
        // disable sweep if edit mode.
-       MP_CHECK(elm_genlist_decorate_mode_get(obj) == EINA_FALSE);
        MP_CHECK(elm_genlist_item_flip_get(event_info) == EINA_FALSE);
        // Start genlist sweep
        elm_genlist_item_decorate_mode_set(event_info, "slide", EINA_TRUE);
@@ -305,7 +303,6 @@ static void _mp_list_set_edit(void *thiz, bool edit)
                                elm_genlist_item_update(sweeped_item);
                        }
 
-                       elm_genlist_decorate_mode_set(list->genlist, EINA_TRUE);
                }
 
                if (list->reorderable)
@@ -316,7 +313,6 @@ static void _mp_list_set_edit(void *thiz, bool edit)
        else
        {
                if (!MP_LIST_OBJ_IS_GENGRID(list->genlist)) {
-                       elm_genlist_decorate_mode_set(list->genlist, EINA_FALSE);
                }
                mp_list_select_mode_set(list->genlist, ELM_OBJECT_SELECT_MODE_DEFAULT);
                mp_list_reorder_mode_set(list->genlist, EINA_FALSE);

diff --git a/src/widget/mp-playlist-list.c b/src/widget/mp-playlist-list.c
index 21333c7a3e5a788ff755ca9fe765b0c209bb5cb1..ab3b4bdef93a2f81512c54bba30ec10cacb89d41 100755 (executable)
--- a/src/widget/mp-playlist-list.c
+++ b/src/widget/mp-playlist-list.c
@@ -458,7 +458,6 @@ static void _mp_playlist_list_set_edit(void *thiz, bool edit)
 
                if (!MP_LIST_OBJ_IS_GENGRID(list->genlist)) {
                        elm_genlist_clear(list->genlist);
-                       elm_genlist_decorate_mode_set(list->genlist, EINA_TRUE);
                }
                else
                {

diff --git a/src/widget/mp-track-list.c b/src/widget/mp-track-list.c
index 974a886c038c5989c492784cd5009fe2aa4ce4d7..88f03427b929f250afc3f8766193dc2edc2ce16b 100644 (file)
--- a/src/widget/mp-track-list.c
+++ b/src/widget/mp-track-list.c
@@ -207,7 +207,7 @@ _mp_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
 
        Evas_Object *check = NULL;
 
-       if (elm_genlist_decorate_mode_get(obj)) {
+       if (list->edit_mode) {
                // if edit mode
                if (!strcmp(part, "elm.icon.2")) {
                        // swallow checkbox or radio button