From: discomfitor Date: Wed, 7 Mar 2012 16:18:38 +0000 (+0000) Subject: seriously file globbing. another day would have been much better. X-Git-Tag: REL_F_I9500_20120323_1~17^2~182 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d2c80978a9fae69891a36d35e9293a67d536008;p=framework%2Fuifw%2Felementary.git seriously file globbing. another day would have been much better. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68991 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/edje_externals/elm_gengrid.c b/src/edje_externals/elm_gengrid.c index 263e609..9319d5e 100644 --- a/src/edje_externals/elm_gengrid.c +++ b/src/edje_externals/elm_gengrid.c @@ -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; diff --git a/src/edje_externals/elm_genlist.c b/src/edje_externals/elm_genlist.c index db83663..9c7c773 100644 --- a/src/edje_externals/elm_genlist.c +++ b/src/edje_externals/elm_genlist.c @@ -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; diff --git a/src/edje_externals/elm_list.c b/src/edje_externals/elm_list.c index bac3210..25b38aa 100644 --- a/src/edje_externals/elm_list.c +++ b/src/edje_externals/elm_list.c @@ -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; diff --git a/src/edje_externals/elm_toolbar.c b/src/edje_externals/elm_toolbar.c index 5c55ae5..a3fe781 100644 --- a/src/edje_externals/elm_toolbar.c +++ b/src/edje_externals/elm_toolbar.c @@ -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; diff --git a/src/examples/gengrid_example.c b/src/examples/gengrid_example.c index 9e655bf..d55daba 100644 --- a/src/examples/gengrid_example.c +++ b/src/examples/gengrid_example.c @@ -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"); diff --git a/src/examples/genlist_example_02.c b/src/examples/genlist_example_02.c index e0fb3fb..4240fb0 100644 --- a/src/examples/genlist_example_02.c +++ b/src/examples/genlist_example_02.c @@ -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); diff --git a/src/examples/list_example_02.c b/src/examples/list_example_02.c index 2bbf806..4d52882 100644 --- a/src/examples/list_example_02.c +++ b/src/examples/list_example_02.c @@ -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); diff --git a/src/examples/web_example.c b/src/examples/web_example.c index 936f51f..6aa6a2a 100644 --- a/src/examples/web_example.c +++ b/src/examples/web_example.c @@ -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); diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index a5ff8bd..1aba95d 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -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; } diff --git a/src/lib/elm_list.h b/src/lib/elm_list.h index 7cb6f30..0644f6c 100644 --- a/src/lib/elm_list.h +++ b/src/lib/elm_list.h @@ -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. *