Hi Martin. I submitted your patch - 67386. but I dropped eve patches because I didn't catch your irc messages before I modify eve. Anyway, thanks. :) ------------------------------------ -Regards, Hermet- -----Original Message----- From: "Enlightenment SVN"<[email protected]> To: [email protected] Cc: Sent: 12-01-20(금) 19:37:36 Subject: E SVN: hermet trunk/enjoy/src/bin Log: enjoy - [PATCH 1/3] enjoy: Elm_Genlist_Item -> Elm_Object_Item Signed-off-by: Martin Jansa <[email protected]> Author: hermet Date: 2012-01-20 02:37:35 -0800 (Fri, 20 Jan 2012) New Revision: 67386 Trac: http://trac.enlightenment.org/e/changeset/67386 Modified: trunk/enjoy/src/bin/page.c trunk/enjoy/src/bin/preferences.c Modified: trunk/enjoy/src/bin/page.c =================================================================== --- trunk/enjoy/src/bin/page.c 2012-01-20 10:31:07 UTC (rev 67385) +++ trunk/enjoy/src/bin/page.c 2012-01-20 10:37:35 UTC (rev 67386) @@ -121,8 +121,8 @@ const char *title; void *container; void *model; - Elm_Genlist_Item *selected; - Elm_Genlist_Item *first; + Elm_Object_Item *selected; + Elm_Object_Item *first; Eina_Iterator *iterator; Ecore_Idler *populate; Eina_Hash *od_to_list_item; @@ -168,7 +168,7 @@ for (count = 0; count < cls->populate_iteration_count; count++) { - Elm_Genlist_Item *it; + Elm_Object_Item *glit; char letter; void *id, *od; const char **letter_str; @@ -179,7 +179,7 @@ od = cls->data_from_itr(id); if (!od) goto end; - it = elm_genlist_item_append + glit = elm_genlist_item_append (page->list, cls->item_cls, od, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); @@ -193,10 +193,10 @@ elm_index_item_append(page->index, "Special", page->first); page->last_index_letter[0] = letter; - elm_index_item_append(page->index, page->last_index_letter, it); + elm_index_item_append(page->index, page->last_index_letter, glit); } - if (!page->first) page->first = it; - eina_hash_set(page->od_to_list_item, od, it); + if (!page->first) page->first = glit; + eina_hash_set(page->od_to_list_item, od, glit); page->num_elements++; } @@ -214,17 +214,17 @@ _page_selected(void *data, Evas_Object *o, void *event_info) { Page *page = data; - Elm_Genlist_Item *it = event_info; - if (page->selected == it) return; - page->selected = it; + Elm_Object_Item *glit = event_info; + if (page->selected == glit) return; + page->selected = glit; page->cls->selected(data, o, event_info); } static void _page_index_changed(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *event_info) { - Elm_Genlist_Item *it = event_info; - elm_genlist_item_top_bring_in(it); + Elm_Object_Item *glit = event_info; + elm_genlist_item_top_bring_in(glit); } static void @@ -725,25 +725,25 @@ page_songs_next_exists(const Evas_Object *obj) { PAGE_SONGS_GET_OR_RETURN(page, obj, EINA_FALSE); - Elm_Genlist_Item *it = page->selected; - if (!it) return EINA_FALSE; - it = elm_genlist_item_next_get(it); - return !!it; + Elm_Object_Item *glit = page->selected; + if (!glit) return EINA_FALSE; + glit = elm_genlist_item_next_get(glit); + return !!glit; } Song * page_songs_next_go(Evas_Object *obj) { PAGE_SONGS_GET_OR_RETURN(page, obj, NULL); - Elm_Genlist_Item *it = page->selected; + Elm_Object_Item *glit = page->selected; Song *song; - if (!it) return NULL; - it = elm_genlist_item_next_get(it); - if (!it) return NULL; - song = elm_genlist_item_data_get(it); - page->selected = it; - elm_genlist_item_selected_set(it, EINA_TRUE); - elm_genlist_item_bring_in(it); + if (!glit) return NULL; + glit = elm_genlist_item_next_get(glit); + if (!glit) return NULL; + song = elm_genlist_item_data_get(glit); + page->selected = glit; + elm_genlist_item_selected_set(glit, EINA_TRUE); + elm_genlist_item_bring_in(glit); return song; } @@ -751,12 +751,12 @@ page_songs_selected_n_get(const Evas_Object *obj) { PAGE_SONGS_GET_OR_RETURN(page, obj, 0); - Elm_Genlist_Item *it; + Elm_Object_Item *glit; int n; - for (n = 0, it = page->first; - it && it != page->selected; - n++, it = elm_genlist_item_next_get(it)); - return (it) ? n : 0; + for (n = 0, glit = page->first; + glit && glit != page->selected; + n++, glit = elm_genlist_item_next_get(glit)); + return (glit) ? n : 0; } int32_t @@ -770,17 +770,17 @@ page_songs_nth_get(const Evas_Object *obj, int32_t n) { PAGE_SONGS_GET_OR_RETURN(page, obj, NULL); - Elm_Genlist_Item *it = page->first; - while (it && n--) it = elm_genlist_item_next_get(it); - if (!it) return NULL; - return elm_genlist_item_data_get(it); + Elm_Object_Item *glit = page->first; + while (glit && n--) glit = elm_genlist_item_next_get(glit); + if (!glit) return NULL; + return elm_genlist_item_data_get(glit); } Eina_Bool _page_shuffle_array(Page *page, Eina_Bool next) { size_t i, j; - Elm_Genlist_Item *it; + Elm_Object_Item *glit; if (!page->first) return EINA_FALSE; @@ -794,16 +794,16 @@ if ((page->shuffle_position >= page->num_elements) || (page->shuffle_position == 0)) { - it = page->first; - eina_array_data_set(page->shuffle, 0, it); - it = elm_genlist_item_next_get(it); - for (i = 1; it; i++) + glit = page->first; + eina_array_data_set(page->shuffle, 0, glit); + glit = elm_genlist_item_next_get(glit); + for (i = 1; glit; i++) { j = rand() % (i + 1); eina_array_data_set(page->shuffle, i, eina_array_data_get(page->shuffle, j)); - eina_array_data_set(page->shuffle, j, it); - it = elm_genlist_item_next_get(it); + eina_array_data_set(page->shuffle, j, glit); + glit = elm_genlist_item_next_get(glit); } if ((page->selected) && (next)) { @@ -828,7 +828,7 @@ page_songs_shuffle_prev_go(Evas_Object *obj) { Song *song; - Elm_Genlist_Item *it; + Elm_Object_Item *glit; PAGE_SONGS_GET_OR_RETURN(page, obj, NULL); @@ -840,13 +840,13 @@ page->shuffle_position = page->num_elements; } - it = eina_array_data_get(page->shuffle, page->shuffle_position - 1); + glit = eina_array_data_get(page->shuffle, page->shuffle_position - 1); - song = elm_genlist_item_data_get(it); + song = elm_genlist_item_data_get(glit); - page->selected = it; - elm_genlist_item_selected_set(it, EINA_TRUE); - elm_genlist_item_bring_in(it); + page->selected = glit; + elm_genlist_item_selected_set(glit, EINA_TRUE); + elm_genlist_item_bring_in(glit); return song; } @@ -861,19 +861,19 @@ page_songs_shuffle_next_go(Evas_Object *obj) { Song *song; - Elm_Genlist_Item *it; + Elm_Object_Item *glit; PAGE_SONGS_GET_OR_RETURN(page, obj, NULL); _page_shuffle_array(page, EINA_TRUE); - it = eina_array_data_get(page->shuffle, page->shuffle_position); + glit = eina_array_data_get(page->shuffle, page->shuffle_position); page->shuffle_position++; - song = elm_genlist_item_data_get(it); + song = elm_genlist_item_data_get(glit); - page->selected = it; - elm_genlist_item_selected_set(it, EINA_TRUE); - elm_genlist_item_bring_in(it); + page->selected = glit; + elm_genlist_item_selected_set(glit, EINA_TRUE); + elm_genlist_item_bring_in(glit); return song; } @@ -881,25 +881,25 @@ page_songs_prev_exists(const Evas_Object *obj) { PAGE_SONGS_GET_OR_RETURN(page, obj, EINA_FALSE); - Elm_Genlist_Item *it = page->selected; - if (!it) return EINA_FALSE; - it = elm_genlist_item_prev_get(it); - return !!it; + Elm_Object_Item *glit = page->selected; + if (!glit) return EINA_FALSE; + glit = elm_genlist_item_prev_get(glit); + return !!glit; } Song * page_songs_prev_go(Evas_Object *obj) { PAGE_SONGS_GET_OR_RETURN(page, obj, NULL); - Elm_Genlist_Item *it = page->selected; + Elm_Object_Item *glit = page->selected; Song *song; - if (!it) return NULL; - it = elm_genlist_item_prev_get(it); - if (!it) return NULL; - song = elm_genlist_item_data_get(it); - page->selected = it; - elm_genlist_item_selected_set(it, EINA_TRUE); - elm_genlist_item_bring_in(it); + if (!glit) return NULL; + glit = elm_genlist_item_prev_get(glit); + if (!glit) return NULL; + song = elm_genlist_item_data_get(glit); + page->selected = glit; + elm_genlist_item_selected_set(glit, EINA_TRUE); + elm_genlist_item_bring_in(glit); return song; } @@ -929,8 +929,8 @@ static void _album_cover_fetch_finished_cb(void *data) { - Elm_Genlist_Item *it = data; - if (it) elm_genlist_item_update(it); + Elm_Object_Item *glit = data; + if (glit) elm_genlist_item_update(glit); } static Evas_Object * @@ -938,9 +938,9 @@ { Page *page = evas_object_data_get(list, "_enjoy_page"); Album *album = data; - Elm_Genlist_Item *it = eina_hash_find(page->od_to_list_item, album); + Elm_Object_Item *glit = eina_hash_find(page->od_to_list_item, album); return cover_album_fetch(list, page->container, album, page->cls->icon_size, - _album_cover_fetch_finished_cb, it); + _album_cover_fetch_finished_cb, glit); } static void Modified: trunk/enjoy/src/bin/preferences.c =================================================================== --- trunk/enjoy/src/bin/preferences.c 2012-01-20 10:31:07 UTC (rev 67385) +++ trunk/enjoy/src/bin/preferences.c 2012-01-20 10:37:35 UTC (rev 67386) @@ -12,7 +12,7 @@ struct _Preferences_Category { - Elm_Genlist_Item *it; + Elm_Object_Item *glit; int items; char name[]; }; @@ -20,7 +20,7 @@ struct _Enjoy_Preferences_Plugin { const Enjoy_Preferences_Plugin_Api *api; Preferences_Category *cat; /* only if exists in UI */ - Elm_Genlist_Item *it; /* only if exists in UI */ + Elm_Object_Item *glit; /* only if exists in UI */ int priority; }; @@ -80,18 +80,18 @@ static int preferences_category_cmp(const void *pa, const void *pb) { - const Elm_Genlist_Item *ia = pa, *ib = pb; - const Preferences_Category *a = elm_genlist_item_data_get(ia); - const Preferences_Category *b = elm_genlist_item_data_get(ib); + const Elm_Object_Item *glia = pa, *glib = pb; + const Preferences_Category *a = elm_genlist_item_data_get(glia); + const Preferences_Category *b = elm_genlist_item_data_get(glib); return strcoll(a->name, b->name); } static int preferences_item_cmp(const void *pa, const void *pb) { - const Elm_Genlist_Item *ia = pa, *ib = pb; - const Enjoy_Preferences_Plugin *a = elm_genlist_item_data_get(ia); - const Enjoy_Preferences_Plugin *b = elm_genlist_item_data_get(ib); + const Elm_Object_Item *glia = pa, *glib = pb; + const Enjoy_Preferences_Plugin *a = elm_genlist_item_data_get(glia); + const Enjoy_Preferences_Plugin *b = elm_genlist_item_data_get(glib); int r = a->priority - b->priority; if (r) return r; @@ -103,7 +103,7 @@ preferences_item_selected(void *data, Evas_Object *lst, void *event_info) { Enjoy_Preferences_Plugin *p = data; - Elm_Genlist_Item *it = event_info; + Elm_Object_Item *glit = event_info; Elm_Object_Item *oi; Evas_Object *naviframe = elm_object_parent_widget_get(lst); Evas_Object *prev_btn = NULL, *next_btn = NULL, *content = NULL; @@ -116,7 +116,7 @@ return; } - elm_genlist_item_selected_set(it, EINA_FALSE); + elm_genlist_item_selected_set(glit, EINA_FALSE); old_auto_prev_btn = elm_naviframe_prev_btn_auto_pushed_get(naviframe); elm_naviframe_prev_btn_auto_pushed_set(naviframe, auto_prev_btn); @@ -154,23 +154,23 @@ memcpy(cat->name, catname, catnamelen); eina_hash_add(prefs->categories, cat->name, cat); - cat->it = elm_genlist_item_direct_sorted_insert + cat->glit = elm_genlist_item_direct_sorted_insert (prefs->list, &preferences_itc_category, cat, NULL, ELM_GENLIST_ITEM_NONE, preferences_category_cmp, NULL, NULL); - elm_genlist_item_display_only_set(cat->it, EINA_TRUE); + elm_genlist_item_display_only_set(cat->glit, EINA_TRUE); } eina_hash_add(prefs->items, &p, p); cat->items++; p->cat = cat; - p->it = elm_genlist_item_direct_sorted_insert - (prefs->list, &preferences_itc_item, p, cat->it, + p->glit = elm_genlist_item_direct_sorted_insert + (prefs->list, &preferences_itc_item, p, cat->glit, ELM_GENLIST_ITEM_NONE, preferences_item_cmp, preferences_item_selected, p); - DBG("plugin %p item %p cat %p (%s)", p, p->it, cat, cat->name); + DBG("plugin %p item %p cat %p (%s)", p, p->glit, cat, cat->name); return EINA_TRUE; } @@ -187,7 +187,7 @@ if (!prefs->list) DBG("List already deleted, ignore item deletion"); else - elm_genlist_item_del(p->it); + elm_genlist_item_del(p->glit); if (p->cat) { @@ -195,7 +195,7 @@ if (p->cat->items == 0) { if (prefs->list) - elm_genlist_item_del(p->cat->it); + elm_genlist_item_del(p->cat->glit); eina_hash_del(prefs->categories, p->cat->name, p->cat); free(p->cat); } ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ enlightenment-svn mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
