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

elm gen/gengrid/genlist: Applied gen deprecation and gengrid/genlist undeprecation. 

SVN revision: 65716
This commit is contained in:
Daniel Juyung Seo 2011-11-30 14:19:29 +00:00
parent 76285554aa
commit c6b3a7b863
9 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ static void
glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Elm_Genlist_Item *it = event_info;
Evas_Object *gl = elm_gen_item_widget_get(it);
Evas_Object *gl = elm_genlist_item_genlist_get(it);
int val = (int)(long)elm_genlist_item_data_get(it);
Elm_Genlist_Item *it1, *it2, *it3;
@ -275,7 +275,7 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
else
elm_gengrid_item_cursor_set(ti[i].item, ELM_CURSOR_CLOCK);
if (!(i % 5))
elm_gen_item_selected_set(ti[i].item, EINA_TRUE);
elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
}
elm_box_pack_end(bx, grid);
evas_object_show(grid);

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

@ -111,7 +111,7 @@ _gl_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
static void
_test_eio_clear(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
{
elm_gen_clear(data);
elm_genlist_clear(data);
}
void

4
legacy/elementary/src/bin/test_gengrid.c
View File

@ -195,7 +195,7 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
ti[i].path = eina_stringshare_add(buf);
ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL);
if (!(i % 5))
elm_gen_item_selected_set(ti[i].item, EINA_TRUE);
elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
}
evas_object_show(grid);
@ -443,7 +443,7 @@ test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
else
ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL);
if (!(i % 5))
elm_gen_item_selected_set(ti[i].item, EINA_TRUE);
elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
}
evas_object_show(grid);

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

@ -179,7 +179,7 @@ static void
my_gl_clear(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *gl = data;
elm_gen_clear(gl);
elm_genlist_clear(gl);
}
static void
@ -287,7 +287,7 @@ my_gl_disable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
return;
}
elm_genlist_item_disabled_set(gli, 1);
elm_gen_item_selected_set(gli, 0);
elm_genlist_item_selected_set(gli, 0);
elm_genlist_item_update(gli);
}
@ -296,13 +296,13 @@ my_gl_update_all(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
{
Evas_Object *gl = data;
int i = 0;
Elm_Genlist_Item *it = elm_gen_first_item_get(gl);
Elm_Genlist_Item *it = elm_genlist_first_item_get(gl);
while (it)
{
elm_genlist_item_update(it);
printf("%i\n", i);
i++;
it = elm_gen_item_next_get(it);
it = elm_genlist_item_next_get(it);
}
}
@ -310,20 +310,20 @@ static void
my_gl_first(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *gl = data;
Elm_Genlist_Item *gli = elm_gen_first_item_get(gl);
Elm_Genlist_Item *gli = elm_genlist_first_item_get(gl);
if (!gli) return;
elm_genlist_item_show(gli);
elm_gen_item_selected_set(gli, 1);
elm_genlist_item_selected_set(gli, 1);
}
static void
my_gl_last(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *gl = data;
Elm_Genlist_Item *gli = elm_gen_last_item_get(gl);
Elm_Genlist_Item *gli = elm_genlist_last_item_get(gl);
if (!gli) return;
elm_genlist_item_show(gli);
elm_gen_item_selected_set(gli, 1);
elm_genlist_item_selected_set(gli, 1);
}
static Eina_Bool
@ -959,7 +959,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(bx);
gl = elm_genlist_add(win);
elm_gen_always_select_mode_set(gl, 1);
elm_genlist_always_select_mode_set(gl, 1);
evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(gl);
@ -1052,7 +1052,7 @@ static void
gl4_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Elm_Genlist_Item *it = event_info;
Evas_Object *gl = elm_gen_item_widget_get(it);
Evas_Object *gl = elm_genlist_item_genlist_get(it);
int val = (int)(long)elm_genlist_item_data_get(it);
val *= 10;
elm_genlist_item_append(gl, &itc4,
@ -1534,7 +1534,7 @@ static void
gl9_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Elm_Genlist_Item *it = event_info;
Evas_Object *gl = elm_gen_item_widget_get(it);
Evas_Object *gl = elm_genlist_item_genlist_get(it);
int val = (int)(long)elm_genlist_item_data_get(it);
val *= 10;
elm_genlist_item_append(gl, &itc1,

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

@ -52,7 +52,7 @@ gltt_exp(void *data __UNUSED__,
void *event_info)
{
Elm_Genlist_Item *it = event_info;
Evas_Object *gl = elm_gen_item_widget_get(it);
Evas_Object *gl = elm_genlist_item_genlist_get(it);
int val = (int)(long)elm_genlist_item_data_get(it);
Elm_Genlist_Item *it1, *it2, *it3;
@ -577,7 +577,7 @@ test_tooltip2(void *data __UNUSED__,
else
elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing Y");
if (!(i % 5))
elm_gen_item_selected_set(ti[i].item, EINA_TRUE);
elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
}
elm_box_pack_end(bx, grid);

52
legacy/elementary/src/edje_externals/elm_gengrid.c
View File

@ -43,32 +43,32 @@ external_gengrid_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
if (p->multi_exists)
elm_gengrid_multi_select_set(obj, p->multi);
if (p->no_select_exists)
elm_gen_no_select_mode_set (obj, p->no_select);
elm_gengrid_no_select_mode_set (obj, p->no_select);
if (p->always_select_exists)
elm_gen_always_select_mode_set (obj, p->always_select);
elm_gengrid_always_select_mode_set (obj, p->always_select);
if (p->h_bounce_exists)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gen_bounce_set(obj, p->h_bounce, v_bounce);
elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
elm_gengrid_bounce_set(obj, p->h_bounce, v_bounce);
}
if (p->v_bounce_exists)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gen_bounce_set(obj, h_bounce, p->v_bounce);
elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
elm_gengrid_bounce_set(obj, h_bounce, p->v_bounce);
}
if (p->h_pagerel_exists)
{
double h_pagerel, v_pagerel;
elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gen_page_relative_set(obj, h_pagerel, p->v_pagerel);
elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gengrid_page_relative_set(obj, h_pagerel, p->v_pagerel);
}
if (p->v_pagerel_exists)
{
double h_pagerel, v_pagerel;
elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gen_page_relative_set(obj, p->h_pagerel, v_pagerel);
elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gengrid_page_relative_set(obj, p->h_pagerel, v_pagerel);
}
if (p->h_itemsize_exists)
{
@ -112,7 +112,7 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_gen_no_select_mode_set(obj, param->i);
elm_gengrid_no_select_mode_set(obj, param->i);
return EINA_TRUE;
}
}
@ -120,7 +120,7 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_gen_always_select_mode_set(obj, param->i);
elm_gengrid_always_select_mode_set(obj, param->i);
return EINA_TRUE;
}
}
@ -129,8 +129,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gen_bounce_set(obj, param->i, v_bounce);
elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
elm_gengrid_bounce_set(obj, param->i, v_bounce);
return EINA_TRUE;
}
}
@ -139,8 +139,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gen_bounce_set(obj, h_bounce, param->i);
elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
elm_gengrid_bounce_set(obj, h_bounce, param->i);
return EINA_TRUE;
}
}
@ -149,8 +149,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
double h_pagerel, v_pagerel;
elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gen_page_relative_set(obj, param->d, v_pagerel);
elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gengrid_page_relative_set(obj, param->d, v_pagerel);
return EINA_TRUE;
}
}
@ -159,8 +159,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
double h_pagerel, v_pagerel;
elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gen_page_relative_set(obj, h_pagerel, param->d);
elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gengrid_page_relative_set(obj, h_pagerel, param->d);
return EINA_TRUE;
}
}
@ -229,7 +229,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_gen_no_select_mode_get(obj);
param->i = elm_gengrid_no_select_mode_get(obj);
return EINA_TRUE;
}
}
@ -237,7 +237,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_gen_always_select_mode_get(obj);
param->i = elm_gengrid_always_select_mode_get(obj);
return EINA_TRUE;
}
}
@ -246,7 +246,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
param->i = h_bounce;
return EINA_TRUE;
}
@ -256,7 +256,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
param->i = v_bounce;
return EINA_TRUE;
}
@ -266,7 +266,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
double h_pagerel, v_pagerel;
elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
param->d = h_pagerel;
return EINA_TRUE;
}
@ -276,7 +276,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
double h_pagerel, v_pagerel;
elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
param->d = v_pagerel;
return EINA_TRUE;
}

32
legacy/elementary/src/edje_externals/elm_genlist.c
View File

@ -58,24 +58,24 @@ external_genlist_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
if (p->multi_exists)
elm_genlist_multi_select_set(obj, p->multi);
if (p->always_select_exists)
elm_gen_always_select_mode_set(obj, p->always_select);
elm_genlist_always_select_mode_set(obj, p->always_select);
if (p->no_select_exists)
elm_gen_no_select_mode_set(obj, p->no_select);
elm_genlist_no_select_mode_set(obj, p->no_select);
if (p->compress_exists)
elm_genlist_compress_mode_set(obj, p->compress);
if (p->homogeneous_exists)
elm_genlist_homogeneous_set(obj, p->homogeneous);
if ((p->h_bounce_exists) && (p->v_bounce_exists))
elm_gen_bounce_set(obj, p->h_bounce, p->v_bounce);
elm_genlist_bounce_set(obj, p->h_bounce, p->v_bounce);
else if ((p->h_bounce_exists) || (p->v_bounce_exists))
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
if (p->h_bounce_exists)
elm_gen_bounce_set(obj, p->h_bounce, v_bounce);
elm_genlist_bounce_set(obj, p->h_bounce, v_bounce);
else
elm_gen_bounce_set(obj, h_bounce, p->v_bounce);
elm_genlist_bounce_set(obj, h_bounce, p->v_bounce);
}
}
@ -105,7 +105,7 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_gen_always_select_mode_set(obj, param->i);
elm_genlist_always_select_mode_set(obj, param->i);
return EINA_TRUE;
}
}
@ -113,7 +113,7 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_gen_no_select_mode_set(obj, param->i);
elm_genlist_no_select_mode_set(obj, param->i);
return EINA_TRUE;
}
}
@ -138,8 +138,8 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gen_bounce_set(obj, param->i, v_bounce);
elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
elm_genlist_bounce_set(obj, param->i, v_bounce);
return EINA_TRUE;
}
}
@ -148,8 +148,8 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_gen_bounce_set(obj, h_bounce, param->i);
elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
elm_genlist_bounce_set(obj, h_bounce, param->i);
return EINA_TRUE;
}
}
@ -188,7 +188,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_gen_always_select_mode_get(obj);
param->i = elm_genlist_always_select_mode_get(obj);
return EINA_TRUE;
}
}
@ -196,7 +196,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_gen_no_select_mode_get(obj);
param->i = elm_genlist_no_select_mode_get(obj);
return EINA_TRUE;
}
}
@ -221,7 +221,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
param->i = h_bounce;
return EINA_TRUE;
}
@ -231,7 +231,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
Eina_Bool h_bounce, v_bounce;
elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
param->i = v_bounce;
return EINA_TRUE;
}

2
legacy/elementary/src/lib/Elementary.h.in
View File

@ -18246,7 +18246,7 @@ extern "C" {
*
* @section Genlist_Usage_Hints Usage hints
*
* There are also convenience functions. elm_gen_item_genlist_get() will
* There are also convenience functions. elm_genlist_item_genlist_get() will
* return the genlist object the item belongs to. elm_genlist_item_show()
* will make the scroller scroll to show that specific item so its visible.
* elm_genlist_item_data_get() returns the data pointer set by the item

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

@ -727,8 +727,8 @@ _populate(Evas_Object *obj,
evas_object_smart_callback_call(obj, SIG_DIRECTORY_OPEN, (void *)path);
if (!parent)
{
elm_gen_clear(wd->files_list);
elm_gen_clear(wd->files_grid);
elm_genlist_clear(wd->files_list);
elm_gengrid_clear(wd->files_grid);
eina_stringshare_replace(&wd->path, path);
_do_anchors(obj, path);
}