enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

[access] use proper name _elm_access_info_get(); not _elm_access_object_get(); to get access information

This commit is contained in:
Shinwoo Kim 2013-07-31 12:53:04 +09:00
parent cd9f1a22bc
commit c47ef1b7fe
31 changed files with 104 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/ChangeLog
View File

@ -1520,3 +1520,7 @@
* Flip : Fix the flip page to not flip on a direction if the direction
is disabled.
2013-07-31 Shinwoo Kim
* Add _elm_access_object_get, deprecate _elm_access_info_get.

1
legacy/elementary/NEWS
View File

@ -81,6 +81,7 @@ Additions:
* Add the configuration thumbscroll_flick_distance_tolerance.
* Add elm_access_highlight_next_set, export elm_widget_focus_region_show
* File Selector : Support elm_object_part_text_set() for the ok, cancel part to change the OK, Cancel button label.
* Add _elm_access_object_get, deprecate _elm_access_info_get
Improvements:

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

@ -625,7 +625,7 @@ _access_multibuttonentry_label_register(Evas_Object *obj, Eina_Bool is_access)
Evas_Object *ao;
ao = _elm_access_edje_object_part_object_register
(obj, sd->label, "mbe.label");
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("multi button entry label"));
}
else
@ -647,7 +647,7 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
Evas_Object *ao;
ao = _elm_access_edje_object_part_object_register
(obj, item->button, "elm.btn.text");
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("multi button entry item"));
}
else
@ -1552,9 +1552,9 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
// ACCESS
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("multi button entry"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("multi button entry"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
}
static void

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

@ -380,9 +380,9 @@ _access_obj_process(Elm_Naviframe_Item *it, Eina_Bool is_access)
eo = elm_layout_edje_get(VIEW(it));
ao =_elm_access_edje_object_part_object_register(WIDGET(it), eo,
TITLE_ACCESS_PART);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Title"));
_elm_access_callback_set(_elm_access_object_get(ao),
_elm_access_callback_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, _access_info_cb, it);
/* to access title access object, any idea? */
((Elm_Widget_Item *)it)->access_obj = ao;
@ -1197,7 +1197,7 @@ _item_new(Evas_Object *obj,
if (!elm_layout_text_get(prev_btn, NULL))
_elm_access_callback_set
(_elm_access_object_get(prev_btn), ELM_ACCESS_INFO,
(_elm_access_info_get(prev_btn), ELM_ACCESS_INFO,
_access_prev_btn_info_cb, it);
}
@ -1207,7 +1207,7 @@ _item_new(Evas_Object *obj,
if (!elm_layout_text_get(next_btn, NULL))
_elm_access_text_set
(_elm_access_object_get(next_btn), ELM_ACCESS_INFO, E_("Next"));
(_elm_access_info_get(next_btn), ELM_ACCESS_INFO, E_("Next"));
}
_item_content_set(it, content);

16
legacy/elementary/src/lib/elc_popup.c
View File

@ -260,9 +260,9 @@ _access_obj_process(Eo *obj, Eina_Bool is_access)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_TITLE_PART);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Title"));
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, sd->title_text);
}
@ -270,9 +270,9 @@ _access_obj_process(Eo *obj, Eina_Bool is_access)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_BODY_PART);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Body Text"));
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, elm_object_text_get(sd->text_content_obj));
}
}
@ -878,10 +878,10 @@ _title_text_set(Evas_Object *obj,
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_TITLE_PART);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Title"));
}
_elm_access_text_set(_elm_access_object_get(ao), ELM_ACCESS_INFO, text);
_elm_access_text_set(_elm_access_info_get(ao), ELM_ACCESS_INFO, text);
}
if (sd->title_text)
@ -946,10 +946,10 @@ _content_text_set(Evas_Object *obj,
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_BODY_PART);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Body Text"));
}
_elm_access_text_set(_elm_access_object_get(ao), ELM_ACCESS_INFO, text);
_elm_access_text_set(_elm_access_info_get(ao), ELM_ACCESS_INFO, text);
}
end:

28
legacy/elementary/src/lib/elm_access.c
View File

@ -522,7 +522,7 @@ _access_highlight_next_get(Evas_Object *obj, Elm_Focus_Direction dir)
{
if (ho)
{
Elm_Access_Info *info = _elm_access_object_get(ho);
Elm_Access_Info *info = _elm_access_info_get(ho);
if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT && info->next)
target = info->next;
else if (type == ELM_ACCESS_ACTION_HIGHLIGHT_PREV && info->prev)
@ -678,7 +678,7 @@ _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir)
if (!ho) elm_widget_focus_cycle(obj, dir);
else if (!_access_action_callback_call(ho, type, NULL))
{
Elm_Access_Info *info = _elm_access_object_get(ho);
Elm_Access_Info *info = _elm_access_info_get(ho);
Evas_Object *comming = NULL;
if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT)
{
@ -772,11 +772,17 @@ _elm_access_say(const char *txt)
}
EAPI Elm_Access_Info *
_elm_access_object_get(const Evas_Object *obj)
_elm_access_info_get(const Evas_Object *obj)
{
return evas_object_data_get(obj, "_elm_access");
}
EAPI Elm_Access_Info *
_elm_access_object_get(const Evas_Object *obj)
{
return _elm_access_info_get(obj);
}
EAPI void
_elm_access_object_hilight(Evas_Object *obj)
{
@ -1174,20 +1180,20 @@ elm_access_object_get(const Evas_Object *obj)
EAPI void
elm_access_info_set(Evas_Object *obj, int type, const char *text)
{
_elm_access_text_set(_elm_access_object_get(obj), type, text);
_elm_access_text_set(_elm_access_info_get(obj), type, text);
}
EAPI char *
elm_access_info_get(const Evas_Object *obj, int type)
{
return _elm_access_text_get(_elm_access_object_get(obj), type, obj);
return _elm_access_text_get(_elm_access_info_get(obj), type, obj);
}
EAPI void
elm_access_info_cb_set(Evas_Object *obj, int type,
Elm_Access_Info_Cb func, const void *data)
{
_elm_access_callback_set(_elm_access_object_get(obj), type, func, data);
_elm_access_callback_set(_elm_access_info_get(obj), type, func, data);
}
EAPI void
@ -1196,7 +1202,7 @@ elm_access_activate_cb_set(Evas_Object *obj,
{
Elm_Access_Info *ac;
ac = _elm_access_object_get(obj);
ac = _elm_access_info_get(obj);
if (!ac) return;
ac->activate = func;
@ -1310,7 +1316,7 @@ EAPI void
elm_access_external_info_set(Evas_Object *obj, const char *text)
{
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_CONTEXT_INFO, text);
(_elm_access_info_get(obj), ELM_ACCESS_CONTEXT_INFO, text);
}
EAPI char *
@ -1318,7 +1324,7 @@ elm_access_external_info_get(const Evas_Object *obj)
{
Elm_Access_Info *ac;
ac = _elm_access_object_get(obj);
ac = _elm_access_info_get(obj);
return _elm_access_text_get(ac, ELM_ACCESS_CONTEXT_INFO, obj);
}
@ -1328,8 +1334,8 @@ elm_access_highlight_next_set(Evas_Object *obj, Elm_Highlight_Direction dir, Eva
EINA_SAFETY_ON_FALSE_RETURN(obj);
EINA_SAFETY_ON_FALSE_RETURN(next);
Elm_Access_Info *info = _elm_access_object_get(obj);
Elm_Access_Info *info_next = _elm_access_object_get(next);
Elm_Access_Info *info = _elm_access_info_get(obj);
Elm_Access_Info *info_next = _elm_access_info_get(next);
if (!info || !info_next)
{

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

@ -214,9 +214,9 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
// ACCESS
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Bubble"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Bubble"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");

6
legacy/elementary/src/lib/elm_button.c
View File

@ -304,11 +304,11 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Button"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Button"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)))

16
legacy/elementary/src/lib/elm_calendar.c
View File

@ -269,9 +269,9 @@ _access_calendar_item_register(Evas_Object *obj)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), pname);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("calendar item"));
_elm_access_callback_set(_elm_access_object_get(ao),
_elm_access_callback_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, _access_info_cb, NULL);
snprintf(day_s, sizeof(day_s), "%i", day++);
@ -295,32 +295,32 @@ _access_calendar_spinner_register(Evas_Object *obj)
sd->dec_btn_month_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "left_bt");
ai = _elm_access_object_get(sd->dec_btn_month_access);
ai = _elm_access_info_get(sd->dec_btn_month_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement month button"));
sd->dec_btn_year_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "left_bt_year");
ai = _elm_access_object_get(sd->dec_btn_year_access);
ai = _elm_access_info_get(sd->dec_btn_year_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement year button"));
sd->inc_btn_month_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "right_bt");
ai = _elm_access_object_get(sd->inc_btn_month_access);
ai = _elm_access_info_get(sd->inc_btn_month_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment month button"));
sd->inc_btn_year_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "right_bt_year");
ai = _elm_access_object_get(sd->inc_btn_year_access);
ai = _elm_access_info_get(sd->inc_btn_year_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment year button"));
sd->month_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "text_month");
ai = _elm_access_object_get(sd->month_access);
ai = _elm_access_info_get(sd->month_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar month"));
sd->year_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "year_text");
ai = _elm_access_object_get(sd->year_access);
ai = _elm_access_info_get(sd->year_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year"));
po = (Evas_Object *)edje_object_part_object_get

6
legacy/elementary/src/lib/elm_check.c
View File

@ -305,11 +305,11 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Check"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Check"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
elm_widget_can_focus_set(obj, EINA_TRUE);

22
legacy/elementary/src/lib/elm_clock.c
View File

@ -247,20 +247,20 @@ _access_time_register(Evas_Object *obj, Eina_Bool is_access)
eina_strbuf_append_printf(strbuf,
"clock increment button for %s", digit);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf));
_elm_access_activate_callback_set
(_elm_access_object_get(ao), _access_activate_cb, obj);
(_elm_access_info_get(ao), _access_activate_cb, obj);
/* decrement button */
ao = _elm_access_edje_object_part_object_register
(obj, sd->digit[i], "access.b");
eina_strbuf_replace(strbuf, "increment", "decrement", 1);
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf));
_elm_access_activate_callback_set
(_elm_access_object_get(ao), _access_activate_cb, obj);
(_elm_access_info_get(ao), _access_activate_cb, obj);
eina_strbuf_free(strbuf);
@ -296,18 +296,18 @@ _access_time_register(Evas_Object *obj, Eina_Bool is_access)
/* increment button */
ao = _elm_access_edje_object_part_object_register
(obj, sd->am_pm_obj, "access.t");
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("clock increment button for am,pm"));
_elm_access_activate_callback_set
(_elm_access_object_get(ao), _access_activate_cb, obj);
(_elm_access_info_get(ao), _access_activate_cb, obj);
/* decrement button */
ao = _elm_access_edje_object_part_object_register
(obj, sd->am_pm_obj, "access.b");
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("clock decrement button for am,pm"));
_elm_access_activate_callback_set
(_elm_access_object_get(ao), _access_activate_cb, obj);
(_elm_access_info_get(ao), _access_activate_cb, obj);
edje_object_signal_emit
(sd->am_pm_obj, "elm,state,access,edit,on", "elm");
@ -690,12 +690,12 @@ _elm_clock_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Clock"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Clock"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
evas_object_propagate_events_set(obj, EINA_FALSE);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
}
static void

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

@ -878,7 +878,7 @@ _access_colorbar_register(Evas_Object *obj,
const char* colorbar_type = NULL;
ao = _elm_access_edje_object_part_object_register(obj, cd->colorbar, part);
ai = _elm_access_object_get(ao);
ai = _elm_access_info_get(ao);
switch (cd->color_type)
{
@ -1351,7 +1351,7 @@ _access_widget_item_register(Elm_Color_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("color selector palette item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);

2
legacy/elementary/src/lib/elm_datetime.c
View File

@ -841,7 +841,7 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->access_obj = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "access");
ai = _elm_access_object_get(priv->access_obj);
ai = _elm_access_info_get(priv->access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, "date time");
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj);
}

2
legacy/elementary/src/lib/elm_dayselector.c
View File

@ -417,7 +417,7 @@ _items_create(Evas_Object *obj)
elm_layout_content_set(obj, buf, chk);
// XXX: ACCESS
_elm_access_text_set(_elm_access_object_get(chk),
_elm_access_text_set(_elm_access_info_get(chk),
ELM_ACCESS_TYPE, E_("day selector item"));
}

6
legacy/elementary/src/lib/elm_diskselector.c
View File

@ -667,13 +667,13 @@ _item_new(Evas_Object *obj,
{
_elm_access_widget_item_register((Elm_Widget_Item *)it);
_elm_access_text_set(_elm_access_object_get(it->base.access_obj),
_elm_access_text_set(_elm_access_info_get(it->base.access_obj),
ELM_ACCESS_TYPE, E_("diskselector item"));
_elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
_elm_access_callback_set(_elm_access_info_get(it->base.access_obj),
ELM_ACCESS_INFO,
_access_info_cb, it);
_elm_access_on_highlight_hook_set(
_elm_access_object_get(it->base.access_obj), _access_on_highlight_cb,
_elm_access_info_get(it->base.access_obj), _access_on_highlight_cb,
it);
}

6
legacy/elementary/src/lib/elm_entry.c
View File

@ -3118,11 +3118,11 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
// access
_elm_access_object_register(obj, priv->entry_edje);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Entry"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Entry"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
}
static void

2
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -719,7 +719,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Gengrid Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);

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

@ -1408,7 +1408,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
ai = _elm_access_info_get(it->base.access_obj);
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
_elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it);

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

@ -99,7 +99,7 @@ _access_index_register(Evas_Object *obj)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "access");
_elm_access_text_set
(_elm_access_object_get(ao), ELM_ACCESS_TYPE, E_("Index"));
(_elm_access_info_get(ao), ELM_ACCESS_TYPE, E_("Index"));
}
static char *
@ -124,7 +124,7 @@ _access_widget_item_register(Elm_Index_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Index Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);

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

@ -404,9 +404,9 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Label"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Label"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");

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

@ -1553,7 +1553,7 @@ _access_widget_item_register(Elm_List_Item *it, Eina_Bool is_access)
{
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
ai = _elm_access_info_get(it->base.access_obj);
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
_elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it);

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

@ -113,10 +113,10 @@ _orient_set_do(Evas_Object *obj)
Evas_Object *ao;
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, "btn_icon");
_elm_access_text_set(_elm_access_object_get(ao),
_elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("panel button"));
_elm_access_callback_set
(_elm_access_object_get(ao), ELM_ACCESS_STATE, _access_state_cb, obj);
(_elm_access_info_get(ao), ELM_ACCESS_STATE, _access_state_cb, obj);
}
}

6
legacy/elementary/src/lib/elm_progressbar.c
View File

@ -271,11 +271,11 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("progressbar"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("progressbar"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
}
static void

6
legacy/elementary/src/lib/elm_radio.c
View File

@ -290,11 +290,11 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
}
static void

2
legacy/elementary/src/lib/elm_segment_control.c
View File

@ -549,7 +549,7 @@ _access_widget_item_register(Elm_Segment_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Segment Control Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);

6
legacy/elementary/src/lib/elm_slider.c
View File

@ -859,11 +859,11 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("slider"));
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("slider"));
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
evas_object_smart_changed(obj);
}

6
legacy/elementary/src/lib/elm_spinner.c
View File

@ -610,7 +610,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), increment_part);
ai = _elm_access_object_get(ao);
ai = _elm_access_info_get(ao);
_elm_access_text_set(ai, ELM_ACCESS_TYPE,
E_("spinner increment button"));
_elm_access_activate_callback_set(ai, _access_activate_cb, obj);
@ -619,7 +619,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), decrement_part);
ai = _elm_access_object_get(ao);
ai = _elm_access_info_get(ao);
_elm_access_text_set(ai, ELM_ACCESS_TYPE,
E_("spinner decrement button"));
_elm_access_activate_callback_set(ai, _access_activate_cb, obj);
@ -628,7 +628,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "access_text");
ai = _elm_access_object_get(ao);
ai = _elm_access_info_get(ao);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("spinner"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj);
_elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, obj);

2
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -2064,7 +2064,7 @@ _access_widget_item_register(Elm_Toolbar_Item *it)
{
Elm_Access_Info *ai;
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Toolbar Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);

2
legacy/elementary/src/lib/elm_widget.c
View File

@ -2646,7 +2646,7 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
if (_elm_config->access_mode)
{
Elm_Access_Info *ac;
ac= _elm_access_object_get(obj);
ac= _elm_access_info_get(obj);
if (!ac) return;
}

4
legacy/elementary/src/lib/elm_widget.h
View File

@ -515,7 +515,7 @@ EAPI void _elm_access_callback_set(Elm_Access_Info *ac, int type, El
EAPI char *_elm_access_text_get(const Elm_Access_Info *ac, int type, const Evas_Object *obj); /* this is ok it actually returns a strduped string - it's meant to! */
EAPI void _elm_access_read(Elm_Access_Info *ac, int type, const Evas_Object *obj);
EAPI void _elm_access_say(const char *txt);
EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object *obj);
EAPI Elm_Access_Info *_elm_access_info_get(const Evas_Object *obj);
EAPI void _elm_access_object_hilight(Evas_Object *obj);
EAPI void _elm_access_object_unhilight(Evas_Object *obj);
EAPI void _elm_access_object_hilight_disable(Evas *e);
@ -532,6 +532,8 @@ EAPI void _elm_access_activate_callback_set(Elm_Access_Info *ac, Elm
EAPI void _elm_access_highlight_object_activate(Evas_Object *obj, Elm_Activate act);
EAPI void _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir);
EINA_DEPRECATED EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object *obj);
#define ELM_PREFS_DATA_MAGIC 0xe1f5da7a
/**< put this as the first member in your widget item struct */

4
legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
View File

@ -247,9 +247,9 @@ _access_set(Evas_Object *obj, Elm_Datetime_Field_Type field_type)
}
_elm_access_text_set
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, type);
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, type);
_elm_access_callback_set
(_elm_access_object_get(obj), ELM_ACCESS_STATE, NULL, NULL);
(_elm_access_info_get(obj), ELM_ACCESS_STATE, NULL, NULL);
}
// module fucns for the specific module type