kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renaming ITEMS_SUBITEMS to ITEMS_TREE. 

Signed-off-by: Sanjeev BA <eflelev8@gmail.com>

SVN revision: 68942
This commit is contained in:
Sanjeev BA 2012-03-07 12:57:13 +00:00 committed by Sanjeev BA
parent a311a4cc7d
commit 8cc2af2d7c
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/doc/examples.dox
View File

@ -4977,7 +4977,7 @@
* However, if the @c item1 didn't have any child previously, we have to change
* it to a parent item now. It would be easy to just change its item class to
* the parent type, but there's no way to change the item flags and make it be
* of the type #ELM_GENLIST_ITEM_SUBITEMS. Thus, we have to delete it and create
* of the type #ELM_GENLIST_ITEM_TREE. Thus, we have to delete it and create
* a new item, and add this new item to the same position that the deleted one
* was. That's the reason of the checks inside the bigger @c if.
*

6
legacy/elementary/src/bin/test_cursor.c
View File

@ -58,7 +58,7 @@ glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit,
ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
ELM_GENLIST_ITEM_TREE, NULL, NULL);
elm_genlist_item_cursor_set(glit1, ELM_CURSOR_HAND2);
elm_genlist_item_cursor_set(glit2, ELM_CURSOR_HAND2);
@ -236,9 +236,9 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
itct.func.text_get = glt_text_get;
glit1 = elm_genlist_item_append(gl, &itct, (void *) 1, NULL,
ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
ELM_GENLIST_ITEM_TREE, NULL, NULL);
glit2 = elm_genlist_item_append(gl, &itct, (void *) 2, NULL,
ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
ELM_GENLIST_ITEM_TREE, NULL, NULL);
glit3 = elm_genlist_item_append(gl, &itct, (void *) 3, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);

60
legacy/elementary/src/bin/test_genlist.c
View File

@ -1162,7 +1162,7 @@ gl4_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
elm_genlist_item_append(gl, &itc4,
(void *)(long) (val + 3)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
}
static void
@ -1251,10 +1251,10 @@ test_genlist6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
itc4.func.del = gl4_del;
elm_genlist_item_append(gl, &itc4,
(void *)1/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
(void *)1/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc4,
(void *)2/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
(void *)2/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc4,
(void *)3/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
@ -1639,7 +1639,7 @@ gl9_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
elm_genlist_item_append(gl, itc1,
(void *)(long) (val + 3)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
}
@ -1705,26 +1705,26 @@ test_genlist9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
NULL/* func data */);
elm_genlist_item_display_only_set(git, EINA_TRUE);
elm_genlist_item_append(gl, itc1,
(void *)1/* item data */, git/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
(void *)1/* item data */, git/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, itc1,
(void *)2/* item data */, git/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, itc1,
(void *)3/* item data */, git/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
(void *)3/* item data */, git/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
git = elm_genlist_item_append(gl, &itc_group,
(void *)4/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_GROUP, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_display_only_set(git, EINA_TRUE);
elm_genlist_item_append(gl, itc1,
(void *)5/* item data */, git/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
(void *)5/* item data */, git/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, itc1,
(void *)6/* item data */, git/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, itc1,
(void *)7/* item data */, git/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */,
(void *)7/* item data */, git/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */,
NULL/* func data */);
elm_genlist_item_class_free(itc1);
@ -2063,7 +2063,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
{
pi[i] = elm_genlist_item_sorted_insert
(gl, &itc4, (void *)(long)idx[i]/* item data */, NULL/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl13_cmp/* cmp */,
ELM_GENLIST_ITEM_TREE, gl13_cmp/* cmp */,
NULL/* func */, NULL/* func data */);
}
@ -2083,7 +2083,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
{
pi[i + 3] = elm_genlist_item_sorted_insert
(gl, &itc4, (void *)(long)(idx[i] * 2)/* item data */, NULL/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl13_cmp/* cmp */, NULL/* func */,
ELM_GENLIST_ITEM_TREE, gl13_cmp/* cmp */, NULL/* func */,
NULL/* func data */);
}
@ -2214,7 +2214,7 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
pi[0] = elm_genlist_item_append
(gl, &itc4, (void *)(long)idx[0]/* item data */,
NULL/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
for (i = 1; i < 3; i++)
{
@ -2222,12 +2222,12 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
pi[i] = elm_genlist_item_insert_before
(gl, &itc4, (void *)(long)idx[i]/* item data */,
NULL/* parent */, pi[-relative[i]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
else
pi[i] = elm_genlist_item_insert_after
(gl, &itc4, (void *)(long)idx[i]/* item data */,
NULL/* parent */, pi[relative[i]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
}
for (i = 0; i < 3; i++)
@ -2239,19 +2239,19 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
sub_glit[0] = elm_genlist_item_append
(gl, &itc4, (void *)(long) (idx[0] + base)/* item data */, pi[i]/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
for (j = 1; j < 6; j++) {
if (relative[j] < 0)
sub_glit[j] = elm_genlist_item_insert_before
(gl, &itc4, (void *)(long) (idx[j] + base)/* item data */,
pi[i]/* parent */, sub_glit[-relative[j]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
else
sub_glit[j] = elm_genlist_item_insert_after
(gl, &itc4, (void *)(long) (idx[j] + base)/* item data */,
pi[i]/* parent */, sub_glit[relative[j]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
}
}
@ -2261,12 +2261,12 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
pi[i] = elm_genlist_item_insert_before
(gl, &itc4, (void *)(long) idx[i]/* item data */,
NULL/* parent */, pi[-relative[i]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
else
pi[i] = elm_genlist_item_insert_after
(gl, &itc4, (void *)(long) idx[i]/* item data */,
NULL/* parent */, pi[relative[i]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
}
for (i = 3; i < 6; i++)
@ -2278,19 +2278,19 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
sub_glit[0] = elm_genlist_item_append
(gl, &itc4, (void *)(long) (idx[0] + base)/* item data */, pi[i]/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
for (j = 1; j < 6; j++) {
if (relative[j] < 0)
sub_glit[j] = elm_genlist_item_insert_before
(gl, &itc4, (void *)(long) (idx[j] + base)/* item data */,
pi[i]/* parent */, sub_glit[-relative[j]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
else
sub_glit[j] = elm_genlist_item_insert_after
(gl, &itc4, (void *)(long) (idx[j] + base)/* item data */,
pi[i]/* parent */, sub_glit[relative[j]],
ELM_GENLIST_ITEM_SUBITEMS, NULL/* func */, NULL/* func data */);
ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */);
}
}
@ -2612,32 +2612,32 @@ gl17_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
elm_genlist_item_append(gl, &itc17,
(void *)(long) (val + 1)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc17,
(void *)(long) (val + 2)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc17,
(void *)(long) (val + 3)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc17,
(void *)(long) (val + 4)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc17,
(void *)(long) (val + 5)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc17,
(void *)(long) (val + 6)/* item data */,
glit/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
}
@ -2741,13 +2741,13 @@ test_genlist17(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
itc17.func.del = gl17_del;
elm_genlist_item_append(gl, &itc17,
(void *)1/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
(void *)1/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc17,
(void *)2/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
(void *)2/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
elm_genlist_item_append(gl, &itc17,
(void *)3/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl17_sel/* func */,
(void *)3/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl17_sel/* func */,
NULL/* func data */);
evas_object_smart_callback_add(gl, "expand,request", gl17_exp_req, gl);

2
legacy/elementary/src/bin/test_panel.c
View File

@ -121,7 +121,7 @@ _fill_list(Evas_Object *obj)
NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
else
elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
NULL, ELM_GENLIST_ITEM_SUBITEMS,
NULL, ELM_GENLIST_ITEM_TREE,
NULL, NULL);
}
}

6
legacy/elementary/src/bin/test_tooltip.c
View File

@ -62,7 +62,7 @@ gltt_exp(void *data __UNUSED__,
glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit,
ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
ELM_GENLIST_ITEM_TREE, NULL, NULL);
elm_genlist_item_tooltip_text_set(glit1, "Testing A");
elm_genlist_item_tooltip_text_set(glit2, "Testing B");
@ -592,9 +592,9 @@ test_tooltip2(void *data __UNUSED__,
itct.func.text_get = gltt_text_get;
glit1 = elm_genlist_item_append(gl, &itct, (void *)1, NULL,
ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
ELM_GENLIST_ITEM_TREE, NULL, NULL);
glit2 = elm_genlist_item_append(gl, &itct, (void *)2, NULL,
ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
ELM_GENLIST_ITEM_TREE, NULL, NULL);
glit3 = elm_genlist_item_append(gl, &itct, (void *)3, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);

8
legacy/elementary/src/examples/genlist_example_05.c
View File

@ -185,11 +185,11 @@ _add_child_cb(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__
if (glit_prev != glit_parent)
glit = elm_genlist_item_insert_after(list, _itp, d, glit_parent,
glit_prev,
ELM_GENLIST_ITEM_SUBITEMS,
ELM_GENLIST_ITEM_TREE,
_item_sel_cb, NULL);
else
glit = elm_genlist_item_prepend(list, _itp, d, glit_parent,
ELM_GENLIST_ITEM_SUBITEMS,
ELM_GENLIST_ITEM_TREE,
_item_sel_cb, NULL);
elm_genlist_item_expanded_set(glit, EINA_FALSE);
elm_genlist_item_selected_set(glit, EINA_TRUE);
@ -273,7 +273,7 @@ _expanded_cb(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
else if (it_data->children)
{
ic = _itp;
type = ELM_GENLIST_ITEM_SUBITEMS;
type = ELM_GENLIST_ITEM_TREE;
}
else
ic = _itc;
@ -396,7 +396,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
if (i % 3 == 0)
{
glg = gli = elm_genlist_item_append(list, _itp, data, NULL,
ELM_GENLIST_ITEM_SUBITEMS,
ELM_GENLIST_ITEM_TREE,
_item_sel_cb, NULL);
elm_genlist_item_expanded_set(glg, EINA_TRUE);
pdata = data;

4
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -661,7 +661,7 @@ _main_cb(void *data, Eio_File *handler, const Eina_File_Direct_Info *info __UNUS
elm_genlist_item_sorted_insert(wr->wd->files_list, eio_file_associate_find(handler, "type/list"),
eina_stringshare_ref(eio_file_associate_find(handler, "filename")),
wr->parent, wr->wd->expand && is_dir ? ELM_GENLIST_ITEM_SUBITEMS : ELM_GENLIST_ITEM_NONE,
wr->parent, wr->wd->expand && is_dir ? ELM_GENLIST_ITEM_TREE : ELM_GENLIST_ITEM_NONE,
_file_list_cmp, NULL, NULL);
}
else if (wr->wd->mode == ELM_FILESELECTOR_GRID)
@ -757,7 +757,7 @@ _populate(Evas_Object *obj,
elm_genlist_item_append(wd->files_list, list_itc[ELM_DIRECTORY],
real, /* item data */
parent,
wd->expand ? ELM_GENLIST_ITEM_SUBITEMS :
wd->expand ? ELM_GENLIST_ITEM_TREE :
ELM_GENLIST_ITEM_NONE,
NULL, NULL);
else if (wd->mode == ELM_FILESELECTOR_GRID)

8
legacy/elementary/src/lib/elm_genlist.c
View File

@ -1598,7 +1598,7 @@ _item_cache_add(Elm_Gen_Item *it)
evas_object_hide(itc->base_view);
evas_object_move(itc->base_view, -9999, -9999);
itc->item_style = eina_stringshare_add(it->itc->item_style);
if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS) itc->tree = 1;
if (it->item->type & ELM_GENLIST_ITEM_TREE) itc->tree = 1;
itc->compress = (it->wd->compress);
itc->selected = it->selected;
itc->disabled = elm_widget_item_disabled_get(it);
@ -1645,7 +1645,7 @@ _item_cache_find(Elm_Gen_Item *it)
Item_Cache *itc;
Eina_Bool tree = 0;
if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS) tree = 1;
if (it->item->type & ELM_GENLIST_ITEM_TREE) tree = 1;
EINA_INLIST_FOREACH(it->wd->item_cache, itc)
{
if ((itc->selected) || (itc->disabled) || (itc->expanded))
@ -2004,7 +2004,7 @@ _item_realize(Elm_Gen_Item *it,
evas_object_smart_member_add(VIEW(it), it->wd->pan_smart);
elm_widget_sub_object_add(WIDGET(it), VIEW(it));
if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS)
if (it->item->type & ELM_GENLIST_ITEM_TREE)
snprintf(buf, sizeof(buf), "tree%s/%s", it->wd->compress ? "_compress" : "", it->itc->item_style ?: "default");
else
snprintf(buf, sizeof(buf), "item%s/%s", it->wd->compress ? "_compress" : "", it->itc->item_style ?: "default");
@ -3293,7 +3293,7 @@ _edit_mode_item_realize(Elm_Gen_Item *it, Eina_Bool effect_on)
evas_object_smart_member_add(it->edit_obj, it->wd->pan_smart);
elm_widget_sub_object_add(WIDGET(it), it->edit_obj);
if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS)
if (it->item->type & ELM_GENLIST_ITEM_TREE)
strncpy(buf, "tree", sizeof(buf));
else strncpy(buf, "item", sizeof(buf));
if (it->wd->compress)

6
legacy/elementary/src/lib/elm_genlist.h
View File

@ -119,8 +119,8 @@
* data). The parent parameter is the parent genlist item this belongs to if
* it is a tree or an indexed group, and NULL if there is no parent. The
* flags can be a bitmask of #ELM_GENLIST_ITEM_NONE,
* #ELM_GENLIST_ITEM_SUBITEMS and #ELM_GENLIST_ITEM_GROUP. If
* #ELM_GENLIST_ITEM_SUBITEMS is set then this item is displayed as an item
* #ELM_GENLIST_ITEM_TREE and #ELM_GENLIST_ITEM_GROUP. If
* #ELM_GENLIST_ITEM_TREE is set then this item is displayed as an item
* that is able to expand and have child items. If ELM_GENLIST_ITEM_GROUP
* is set then this item is group index item that is displayed at the top
* until the next group comes. The func parameter is a convenience callback
@ -1529,7 +1529,7 @@ EAPI void elm_genlist_item_subitems_clear(Elm_Object_It
* @param it The item
* @param expanded The expanded state (@c EINA_TRUE expanded, @c EINA_FALSE not expanded).
*
* This function flags the item of type #ELM_GENLIST_ITEM_SUBITEMS as
* This function flags the item of type #ELM_GENLIST_ITEM_TREE as
* expanded or not.
*
* The theme will respond to this change visually, and a signal "expanded" or