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

seriously file globbing. another day would have been much better. 

SVN revision: 68991
This commit is contained in:
Mike Blumenkrantz 2012-03-07 16:18:38 +00:00
parent c652e37c6e
commit 4b8fcf7430
10 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,16 +45,16 @@ external_gengrid_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
if (p->no_select_exists)
{
if (p->no_select)
elm_gengrid_select_mode_set (obj, ELM_OBJECT_NO_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_gengrid_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
if (p->always_select_exists)
{
if (p->always_select)
elm_gengrid_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_gengrid_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
if (p->h_bounce_exists)
{
@ -123,9 +123,9 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (param->i)
elm_gengrid_select_mode_set (obj, ELM_OBJECT_NO_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_gengrid_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
return EINA_TRUE;
}
}
@ -134,9 +134,9 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (param->i)
elm_gengrid_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_gengrid_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
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)
{
if (elm_gengrid_select_mode_get (obj) ==
ELM_OBJECT_NO_SELECT)
ELM_OBJECT_SELECT_MODE_NONE)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;
@ -258,7 +258,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (elm_gengrid_select_mode_get (obj) ==
ELM_OBJECT_ALWAYS_SELECT)
ELM_OBJECT_SELECT_MODE_ALWAYS)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;

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

@ -60,16 +60,16 @@ external_genlist_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
if (p->no_select_exists)
{
if (p->no_select)
elm_genlist_select_mode_set (obj, ELM_OBJECT_NO_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_genlist_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
if (p->always_select_exists)
{
if (p->always_select)
elm_genlist_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_genlist_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
if (p->compress_exists)
elm_genlist_compress_mode_set(obj, p->compress);
@ -116,9 +116,9 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (param->i)
elm_genlist_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_genlist_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
return EINA_TRUE;
}
}
@ -127,9 +127,9 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (param->i)
elm_genlist_select_mode_set (obj, ELM_OBJECT_NO_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_genlist_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
return EINA_TRUE;
}
}
@ -205,7 +205,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (elm_genlist_select_mode_get (obj) ==
ELM_OBJECT_ALWAYS_SELECT)
ELM_OBJECT_SELECT_MODE_ALWAYS)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;
@ -217,7 +217,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (elm_genlist_select_mode_get (obj) ==
ELM_OBJECT_NO_SELECT)
ELM_OBJECT_SELECT_MODE_NONE)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;

10
legacy/elementary/src/edje_externals/elm_list.c
View File

@ -90,9 +90,9 @@ external_list_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fro
if (p->always_select_exists)
{
if (p->always_select)
elm_list_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_list_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
}
@ -154,9 +154,9 @@ external_list_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Exte
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (param->i)
elm_list_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_list_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
return EINA_TRUE;
}
}
@ -191,7 +191,7 @@ external_list_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Exte
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (elm_list_select_mode_get (obj) ==
ELM_OBJECT_ALWAYS_SELECT)
ELM_OBJECT_SELECT_MODE_ALWAYS)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;

20
legacy/elementary/src/edje_externals/elm_toolbar.c
View File

@ -55,16 +55,16 @@ external_toolbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
if (p->no_select_exists)
{
if (p->no_select)
elm_toolbar_select_mode_set (obj, ELM_OBJECT_NO_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_toolbar_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
if (p->always_select_exists)
{
if (p->always_select)
elm_toolbar_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_toolbar_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
if (p->horizontal_exists)
elm_toolbar_horizontal_set(obj, p->horizontal);
@ -103,9 +103,9 @@ external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (param->i)
elm_toolbar_select_mode_set (obj, ELM_OBJECT_ALWAYS_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_toolbar_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
return EINA_TRUE;
}
}
@ -114,9 +114,9 @@ external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (param->i)
elm_toolbar_select_mode_set (obj, ELM_OBJECT_NO_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_toolbar_select_mode_set (obj, ELM_OBJECT_NORMAL_SELECT);
elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
return EINA_TRUE;
}
}
@ -176,7 +176,7 @@ external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (elm_toolbar_select_mode_get (obj) ==
ELM_OBJECT_ALWAYS_SELECT)
ELM_OBJECT_SELECT_MODE_ALWAYS)
param->d = EINA_TRUE;
else
param->d = EINA_FALSE;
@ -188,7 +188,7 @@ external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
if (elm_toolbar_select_mode_get (obj) ==
ELM_OBJECT_NO_SELECT)
ELM_OBJECT_SELECT_MODE_NONE)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;

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

@ -67,9 +67,9 @@ _always_select_change(void *data,
Eina_Bool always = elm_check_state_get(obj);
if (always)
elm_gengrid_select_mode_set(grid, ELM_OBJECT_ALWAYS_SELECT);
elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_gengrid_select_mode_set(grid, ELM_OBJECT_NORMAL_SELECT);
elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_DEFAULT);
fprintf(stdout, "\"Always select\" mode for gengrid items is now %s\n",
always ? "on" : "off");
@ -126,9 +126,9 @@ _no_sel_change(void *data,
Eina_Bool no_sel = elm_check_state_get(obj);
if (no_sel)
elm_gengrid_select_mode_set(grid, ELM_OBJECT_NO_SELECT);
elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_gengrid_select_mode_set(grid, ELM_OBJECT_NORMAL_SELECT);
elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_DEFAULT);
fprintf(stdout, "Selection for gengrid items is now %s\n",
no_sel ? "disabled" : "enabled");

6
legacy/elementary/src/examples/genlist_example_02.c
View File

@ -130,9 +130,9 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
always = no_sel = EINA_FALSE;
sel_mode = elm_genlist_select_mode_get(list);
if (sel_mode = ELM_OBJECT_ALWAYS_SELECT)
if (sel_mode = ELM_OBJECT_SELECT_MODE_ALWAYS)
always = EINA_TRUE;
else if (sel_mode = ELM_OBJECT_NO_SELECT)
else if (sel_mode = ELM_OBJECT_SELECT_MODE_NONE)
no_sel = EINA_TRUE;
printf("default values:\n");
@ -154,7 +154,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
elm_genlist_homogeneous_set(list, EINA_FALSE);
elm_genlist_mode_set(list, ELM_LIST_LIMIT);
elm_genlist_multi_select_set(list, EINA_TRUE);
elm_genlist_select_mode_set(list, ELM_OBJECT_NORMAL_SELECT);
elm_genlist_select_mode_set(list, ELM_OBJECT_SELECT_MODE_DEFAULT);
elm_genlist_scroller_policy_set(list, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_ON);
elm_genlist_longpress_timeout_set(list, 0.5);
elm_genlist_block_count_set(list, 16);

2
legacy/elementary/src/examples/list_example_02.c
View File

@ -69,7 +69,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
/* enable multiple selection and always select */
elm_list_multi_select_set(li, EINA_TRUE);
elm_list_select_mode_set(li, ELM_OBJECT_ALWAYS_SELECT);
elm_list_select_mode_set(li, ELM_OBJECT_SELECT_MODE_ALWAYS);
/* set bounce and scroller policy */
elm_list_bounce_set(li, EINA_TRUE, EINA_TRUE);

2
legacy/elementary/src/examples/web_example.c
View File

@ -570,7 +570,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
tabs = elm_toolbar_add(win);
elm_toolbar_align_set(tabs, 0.0);
elm_toolbar_select_mode_set(tabs, ELM_OBJECT_ALWAYS_SELECT);
elm_toolbar_select_mode_set(tabs, ELM_OBJECT_SELECT_MODE_ALWAYS);
elm_toolbar_homogeneous_set(tabs, EINA_FALSE);
elm_toolbar_shrink_mode_set(tabs, ELM_TOOLBAR_SHRINK_MENU);
evas_object_size_hint_weight_set(tabs, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

14
legacy/elementary/src/lib/elm_list.c
View File

@ -703,7 +703,7 @@ _item_highlight(Elm_List_Item *it)
if (!wd) return;
ELM_LIST_ITEM_CHECK_DELETED_RETURN(it);
if ((it->highlighted) || (it->base.disabled) ||
(wd->select_mode == ELM_OBJECT_NO_SELECT)) return;
(wd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)) return;
evas_object_ref(obj);
_elm_list_walk(wd);
@ -726,10 +726,10 @@ _item_select(Elm_List_Item *it)
if (!wd) return;
ELM_LIST_ITEM_CHECK_DELETED_RETURN(it);
if (it->base.disabled || (wd->select_mode == ELM_OBJECT_NO_SELECT)) return;
if (it->base.disabled || (wd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)) return;
if (it->selected)
{
if (wd->select_mode == ELM_OBJECT_ALWAYS_SELECT) goto call;
if (wd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS) goto call;
return;
}
it->selected = EINA_TRUE;
@ -1651,12 +1651,12 @@ elm_list_always_select_mode_set(Evas_Object *obj,
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (always_select)
elm_list_select_mode_set(obj, ELM_OBJECT_ALWAYS_SELECT);
elm_list_select_mode_set(obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
{
Elm_Object_Select_Mode oldmode = elm_list_select_mode_get(obj);
if (oldmode == ELM_OBJECT_ALWAYS_SELECT)
elm_list_select_mode_set(obj, ELM_OBJECT_NORMAL_SELECT);
if (oldmode == ELM_OBJECT_SELECT_MODE_ALWAYS)
elm_list_select_mode_set(obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
}
@ -1667,7 +1667,7 @@ elm_list_always_select_mode_get(const Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
Elm_Object_Select_Mode oldmode = elm_list_select_mode_get(obj);
if (oldmode == ELM_OBJECT_ALWAYS_SELECT)
if (oldmode == ELM_OBJECT_SELECT_MODE_ALWAYS)
return EINA_TRUE;
return EINA_FALSE;
}

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

@ -227,12 +227,12 @@ EAPI Eina_Bool elm_list_horizontal_get(const Evas_Object *obj
* @param mode The select mode
*
* elm_list_select_mode_set() changes item select mode in the list widget.
* - ELM_OBJECT_NORMAL_SELECT : Items will only call their selection func and
* - ELM_OBJECT_SELECT_MODE_DEFAULT : Items will only call their selection func and
* callback when first becoming selected. Any further clicks will
* do nothing, unless you set always select mode.
* - ELM_OBJECT_ALWAYS_SELECT : This means that, even if selected,
* - ELM_OBJECT_SELECT_MODE_ALWAYS : This means that, even if selected,
* every click will make the selected callbacks be called.
* - ELM_OBJECT_NO_SELECT : This will turn off the ability to select items
* - ELM_OBJECT_SELECT_MODE_NONE : This will turn off the ability to select items
* entirely and they will neither appear selected nor call selected
* callback functions.
*