From 8b7bbb23987d21ee6a180f5abf9d2b26bbff5106 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 14 Feb 2018 21:14:52 -0500 Subject: [PATCH] efl.access: name -> i18n_name --- src/lib/elementary/efl_access.c | 4 ++-- src/lib/elementary/efl_access.eo | 4 ++-- src/lib/elementary/efl_access.h | 4 ++-- src/lib/elementary/efl_ui_multibuttonentry.c | 4 ++-- src/lib/elementary/efl_ui_spin_button.c | 4 ++-- src/lib/elementary/efl_ui_spin_button.eo | 2 +- src/lib/elementary/efl_ui_text.c | 4 ++-- src/lib/elementary/efl_ui_text.eo | 2 +- src/lib/elementary/efl_ui_widget.c | 4 ++-- src/lib/elementary/efl_ui_widget.eo | 2 +- src/lib/elementary/efl_ui_win.c | 4 ++-- src/lib/elementary/efl_ui_win.eo | 2 +- src/lib/elementary/elc_naviframe.c | 4 ++-- src/lib/elementary/elc_popup.c | 4 ++-- src/lib/elementary/elm_atspi_app_object.c | 2 +- src/lib/elementary/elm_atspi_app_object.eo | 2 +- src/lib/elementary/elm_atspi_bridge.c | 6 ++--- src/lib/elementary/elm_color_item.eo | 2 +- src/lib/elementary/elm_colorselector.c | 4 ++-- src/lib/elementary/elm_entry.c | 4 ++-- src/lib/elementary/elm_entry.eo | 2 +- src/lib/elementary/elm_gengrid.c | 6 ++--- src/lib/elementary/elm_gengrid_item.eo | 2 +- src/lib/elementary/elm_genlist.c | 6 ++--- src/lib/elementary/elm_genlist_item.eo | 2 +- src/lib/elementary/elm_index.c | 4 ++-- src/lib/elementary/elm_index_item.eo | 2 +- src/lib/elementary/elm_list.c | 4 ++-- src/lib/elementary/elm_list_item.eo | 2 +- src/lib/elementary/elm_menu.c | 4 ++-- src/lib/elementary/elm_menu_item.eo | 2 +- .../elementary/elm_multibuttonentry_item.eo | 2 +- src/lib/elementary/elm_popup.eo | 2 +- src/lib/elementary/elm_spinner.c | 6 ++--- src/lib/elementary/elm_spinner.eo | 2 +- src/lib/elementary/elm_toolbar.c | 4 ++-- src/lib/elementary/elm_toolbar_item.eo | 2 +- src/tests/elementary/elm_test_atspi.c | 22 +++++++++---------- 38 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/lib/elementary/efl_access.c b/src/lib/elementary/efl_access.c index 2ed5dde41c..1e956429e8 100644 --- a/src/lib/elementary/efl_access.c +++ b/src/lib/elementary/efl_access.c @@ -317,7 +317,7 @@ _efl_access_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) } EOLIAN const char * -_efl_access_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_i18n_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) { #ifdef ENABLE_NLS if (pd->translation_domain) @@ -327,7 +327,7 @@ _efl_access_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) } EOLIAN static void -_efl_access_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) +_efl_access_i18n_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) { eina_stringshare_replace(&pd->name, val); } diff --git a/src/lib/elementary/efl_access.eo b/src/lib/elementary/efl_access.eo index 5e9f67f2f8..d289ed47d5 100644 --- a/src/lib/elementary/efl_access.eo +++ b/src/lib/elementary/efl_access.eo @@ -258,14 +258,14 @@ mixin Efl.Access (Efl.Interface, Efl.Object) localized_name: string; [[Localized accessible object role name]] } } - @property name @beta { + @property i18n_name @beta { [[Accessible name of the object.]] get { } set { } values { - name: string; [[Accessible name]] + i18n_name: string; [[Accessible name]] } } @property relation_set @protected @beta { diff --git a/src/lib/elementary/efl_access.h b/src/lib/elementary/efl_access.h index ec1d9afe25..7ccf83262b 100644 --- a/src/lib/elementary/efl_access.h +++ b/src/lib/elementary/efl_access.h @@ -90,8 +90,8 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela /** * Emits Accessible 'PropertyChanged' signal for 'Name' property. */ -#define efl_access_name_changed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "name"); +#define efl_access_i18n_name_changed_signal_emit(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "i18n_name"); /** * Emits Accessible 'PropertyChanged' signal for 'Description' property. diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index 47a8e1683e..d276ba9062 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -1983,10 +1983,10 @@ _efl_ui_multibuttonentry_efl_access_children_get(Eo *obj, Efl_Ui_Multibuttonentr } EOLIAN static const char* -_elm_multibuttonentry_item_efl_access_name_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) +_elm_multibuttonentry_item_efl_access_i18n_name_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) { const char *ret; - ret = efl_access_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); + ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); if (ret) return ret; ret = elm_object_part_text_get(VIEW(item), "elm.btn.text"); diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c index 34d969d4ae..c9d52e556b 100644 --- a/src/lib/elementary/efl_ui_spin_button.c +++ b/src/lib/elementary/efl_ui_spin_button.c @@ -882,10 +882,10 @@ _efl_ui_spin_button_efl_access_value_increment_get(Eo *obj EINA_UNUSED, Efl_Ui_S } EOLIAN static const char* -_efl_ui_spin_button_efl_access_name_get(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) +_efl_ui_spin_button_efl_access_i18n_name_get(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) { const char *name; - name = efl_access_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS)); + name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS)); if (name) return name; const char *ret = elm_layout_text_get(obj, "elm.text"); return ret; diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo index a40b15bbf6..3883fe8b0f 100644 --- a/src/lib/elementary/efl_ui_spin_button.eo +++ b/src/lib/elementary/efl_ui_spin_button.eo @@ -68,7 +68,7 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Widget.widget_event; Efl.Ui.Focus.Object.on_focus_update; Efl.Ui.Range.range_value { set; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } Efl.Access.Value.increment { get; } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 403aefb8d1..6546b6dfe1 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -4469,10 +4469,10 @@ _efl_ui_text_efl_access_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED } EOLIAN static const char* -_efl_ui_text_efl_access_name_get(Eo *obj, Efl_Ui_Text_Data *pd) +_efl_ui_text_efl_access_i18n_name_get(Eo *obj, Efl_Ui_Text_Data *pd) { const char *name; - name = efl_access_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); + name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); if (name && strncmp("", name, 1)) return name; const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide"); return ret; diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 047692b010..684452fe23 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo @@ -338,7 +338,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } Efl.Access.state_set { get; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.Text.text { get; } Efl.Access.Text.string { get; } Efl.Access.Text.attribute { get; } diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 93fc33345f..9cb8acc08d 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -5369,10 +5369,10 @@ _efl_ui_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *p } EOLIAN static const char* -_efl_ui_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_efl_ui_widget_efl_access_i18n_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { const char *ret, *name; - name = efl_access_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); + name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); if (name) return name; diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index 737478d5a5..3c6b7561dc 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -585,7 +585,7 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access, Efl.Canvas.Group.group_calculate; Efl.Canvas.Group.group_member_del; Efl.Canvas.Group.group_member_add; - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.state_set { get; } Efl.Access.children { get; } Efl.Access.parent { get; } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 8dafb008c7..5ab1e72874 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -7021,10 +7021,10 @@ _efl_ui_win_efl_access_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) } EOLIAN static const char* -_efl_ui_win_efl_access_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) +_efl_ui_win_efl_access_i18n_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) { const char *ret; - ret = efl_access_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); + ret = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); if (ret) return ret; const char *name = elm_win_title_get(obj); return name; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 26264d84d7..9c26d50814 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -789,7 +789,7 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Wind Efl.Ui.Widget.focus_manager_create; Efl.Access.parent { get; } Efl.Access.state_set { get; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.Component.extents { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Input.State.modifier_enabled { get; } diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index ef8cb9fa81..03ff37abe2 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -545,7 +545,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it, if (nit->title_label) strncat(buf, " ", 1); strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2); } - efl_access_name_set(eo_it, buf); + efl_access_i18n_name_set(eo_it, buf); elm_layout_sizing_eval(WIDGET(nit)); } @@ -1269,7 +1269,7 @@ _item_new(Evas_Object *obj, eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj); efl_access_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB); - efl_access_name_set(eo_item, (char*)title_label); + efl_access_i18n_name_set(eo_item, (char*)title_label); if (!eo_item) { diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 2931ebbd47..9165ff3007 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -1808,12 +1808,12 @@ _elm_popup_efl_access_state_set_get(Eo *obj, Elm_Popup_Data *sd EINA_UNUSED) } EOLIAN static const char* -_elm_popup_efl_access_name_get(Eo *obj, Elm_Popup_Data *sd) +_elm_popup_efl_access_i18n_name_get(Eo *obj, Elm_Popup_Data *sd) { const char *name = NULL; Eina_Strbuf *buf; - name = efl_access_name_get(efl_super(obj, ELM_POPUP_CLASS)); + name = efl_access_i18n_name_get(efl_super(obj, ELM_POPUP_CLASS)); if (name) return name; buf = eina_strbuf_new(); diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c index b1d45c1960..4b0db461c0 100644 --- a/src/lib/elementary/elm_atspi_app_object.c +++ b/src/lib/elementary/elm_atspi_app_object.c @@ -45,7 +45,7 @@ _elm_atspi_app_object_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App } EOLIAN static const char* -_elm_atspi_app_object_efl_access_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_efl_access_i18n_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { const char *ret; ret = elm_app_name_get(); diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo index 2d6bd1396f..80afb46f84 100644 --- a/src/lib/elementary/elm_atspi_app_object.eo +++ b/src/lib/elementary/elm_atspi_app_object.eo @@ -5,7 +5,7 @@ class Elm.Atspi.App.Object (Efl.Object, Efl.Access) data: Elm_Atspi_App_Object_Data; implements { Efl.Object.destructor; - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.description { get; set; } Efl.Access.role { get; } Efl.Access.children { get; } diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 8d5cfe7fdf..cbdbafafe5 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -2078,7 +2078,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * if (!strcmp(property, "Name")) { - ret = efl_access_name_get(obj); + ret = efl_access_i18n_name_get(obj); if (!ret) ret = ""; eldbus_message_iter_basic_append(iter, 's', ret); @@ -3244,7 +3244,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ /* Marshall name */ const char *name = NULL; - name = efl_access_name_get(data); + name = efl_access_i18n_name_get(data); if (!name) name = ""; @@ -3915,7 +3915,7 @@ _property_changed_signal_send(void *data, const Efl_Event *event) prop = ATSPI_OBJECT_PROPERTY_PARENT; atspi_desc = "accessible-parent"; } - else if (!strcmp(property, "name")) + else if (!strcmp(property, "i18n_name")) { prop = ATSPI_OBJECT_PROPERTY_NAME; atspi_desc = "accessible-name"; diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo index a979f76534..84cebb1069 100644 --- a/src/lib/elementary/elm_color_item.eo +++ b/src/lib/elementary/elm_color_item.eo @@ -45,7 +45,7 @@ class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Access.Widget.Act Efl.Ui.Focus.Object.focus { set; } Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Access.state_set { get; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index ef6fe455ac..f040f11308 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2678,14 +2678,14 @@ _elm_color_item_efl_access_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, } EOLIAN static const char* -_elm_color_item_efl_access_name_get(Eo *eo_it, Elm_Color_Item_Data *it) +_elm_color_item_efl_access_i18n_name_get(Eo *eo_it, Elm_Color_Item_Data *it) { Eina_Strbuf *buf; const char *color_name = NULL; const char *name; char *accessible_name; - name = efl_access_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS)); + name = efl_access_i18n_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS)); if (name) return name; buf = eina_strbuf_new(); diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 6851ce5c79..1fbd43488a 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -6038,10 +6038,10 @@ _elm_entry_efl_access_state_set_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) } EOLIAN static const char* -_elm_entry_efl_access_name_get(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_efl_access_i18n_name_get(Eo *obj, Elm_Entry_Data *sd) { const char *name; - name = efl_access_name_get(efl_super(obj, ELM_ENTRY_CLASS)); + name = efl_access_i18n_name_get(efl_super(obj, ELM_ENTRY_CLASS)); if (name && strncmp("", name, 1)) return name; if (sd->password) return NULL; diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 88f71bfada..a72d3443c3 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -855,7 +855,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } Efl.Access.state_set { get; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.Text.text { get; } Efl.Access.Text.string { get; } Efl.Access.Text.attribute { get; } diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index a3acd12647..d07fe96c0b 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -1020,7 +1020,7 @@ _item_text_realize(Elm_Gen_Item *it, edje_object_signal_emit(target, buf, "elm"); } if (_elm_config->atspi_mode) - efl_access_name_changed_signal_emit(EO_OBJ(it)); + efl_access_i18n_name_changed_signal_emit(EO_OBJ(it)); } } @@ -5402,13 +5402,13 @@ _elm_gengrid_item_efl_access_state_set_get(Eo *eo_it, Elm_Gen_Item *it EINA_UNUS } EOLIAN const char* -_elm_gengrid_item_efl_access_name_get(Eo *eo_it, Elm_Gen_Item *it) +_elm_gengrid_item_efl_access_i18n_name_get(Eo *eo_it, Elm_Gen_Item *it) { const char *ret; Eina_Strbuf *buf; char *accessible_name; - ret = efl_access_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); + ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); if (ret) return ret; buf = eina_strbuf_new(); diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo index 32975723f4..51918d859c 100644 --- a/src/lib/elementary/elm_gengrid_item.eo +++ b/src/lib/elementary/elm_gengrid_item.eo @@ -253,7 +253,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Focus.Object, Efl.Ui Elm.Widget.Item.tooltip_unset; Elm.Widget.Item.cursor { set; } Elm.Widget.Item.cursor_unset; - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.state_set { get; } Efl.Ui.Focus.Object.prepare_logical; } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 0cca74401d..bc04f6dac9 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -368,7 +368,7 @@ _item_text_realize(Elm_Gen_Item *it, edje_object_part_text_set(target, key, ""); } if (_elm_config->atspi_mode) - efl_access_name_changed_signal_emit(EO_OBJ(it)); + efl_access_i18n_name_changed_signal_emit(EO_OBJ(it)); } } @@ -8392,13 +8392,13 @@ _elm_genlist_item_efl_access_state_set_get(Eo *eo_it, Elm_Gen_Item *it EINA_UNUS } EOLIAN const char* -_elm_genlist_item_efl_access_name_get(Eo *eo_it, Elm_Gen_Item *it) +_elm_genlist_item_efl_access_i18n_name_get(Eo *eo_it, Elm_Gen_Item *it) { const char *ret; Eina_Strbuf *buf; char *accessible_name; - ret = efl_access_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); + ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); if (ret) return ret; buf = eina_strbuf_new(); diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo index 840d7f7291..3d2c18db72 100644 --- a/src/lib/elementary/elm_genlist_item.eo +++ b/src/lib/elementary/elm_genlist_item.eo @@ -459,7 +459,7 @@ class Elm.Genlist.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Legacy) Elm.Widget.Item.tooltip_unset; Elm.Widget.Item.cursor { set; } Elm.Widget.Item.cursor_unset; - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.state_set { get; } Efl.Ui.Focus.Object.prepare_logical; } diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 51b4806be1..cde542d58a 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1685,10 +1685,10 @@ _elm_index_efl_access_children_get(Eo *obj, Elm_Index_Data *data) } EOLIAN static const char* -_elm_index_item_efl_access_name_get(Eo *eo_it, Elm_Index_Item_Data *data) +_elm_index_item_efl_access_i18n_name_get(Eo *eo_it, Elm_Index_Item_Data *data) { const char *name; - name = efl_access_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS)); + name = efl_access_i18n_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS)); if (name) return name; return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter); diff --git a/src/lib/elementary/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo index 4c2706652e..68b37f5b65 100644 --- a/src/lib/elementary/elm_index_item.eo +++ b/src/lib/elementary/elm_index_item.eo @@ -44,7 +44,7 @@ class Elm.Index.Item(Elm.Widget.Item, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Object.constructor; Efl.Object.destructor; Elm.Widget.Item.access_register; - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 0401ae8188..718d4737f2 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2126,10 +2126,10 @@ _elm_list_item_efl_access_state_set_get(Eo *eo_it, Elm_List_Item_Data *data EINA } EOLIAN static const char* -_elm_list_item_efl_access_name_get(Eo *eo_it, Elm_List_Item_Data *data) +_elm_list_item_efl_access_i18n_name_get(Eo *eo_it, Elm_List_Item_Data *data) { const char *ret; - ret = efl_access_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); + ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); if (ret) return ret; return _elm_widget_item_accessible_plain_name_get(eo_it, data->label); } diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo index c1005780d6..7030486d36 100644 --- a/src/lib/elementary/elm_list_item.eo +++ b/src/lib/elementary/elm_list_item.eo @@ -115,7 +115,7 @@ class Elm.List.Item(Elm.Widget.Item, Efl.Ui.Legacy) Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.state_set { get; } } } diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 00d1b50e1a..94bd613232 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -1406,10 +1406,10 @@ _elm_menu_item_efl_access_role_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) } EOLIAN static const char* -_elm_menu_item_efl_access_name_get(Eo *obj, Elm_Menu_Item_Data *sd) +_elm_menu_item_efl_access_i18n_name_get(Eo *obj, Elm_Menu_Item_Data *sd) { const char *ret; - ret = efl_access_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); + ret = efl_access_i18n_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); if (ret) return ret; return sd->label; } diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo index 464f8313f8..6011399070 100644 --- a/src/lib/elementary/elm_menu_item.eo +++ b/src/lib/elementary/elm_menu_item.eo @@ -66,7 +66,7 @@ class Elm.Menu.Item(Elm.Widget.Item, Efl.Access.Selection, Efl.Access.children { get; } Efl.Access.parent { get; } Efl.Access.role { get; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.state_set { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo index 32a6185190..0d9b7db1b9 100644 --- a/src/lib/elementary/elm_multibuttonentry_item.eo +++ b/src/lib/elementary/elm_multibuttonentry_item.eo @@ -31,7 +31,7 @@ class Elm.Multibuttonentry.Item(Elm.Widget.Item, Elm.Widget.Item.signal_emit; Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.disable; - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } } diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 133f237cbc..e96b08d565 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -177,7 +177,7 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Layout.Signal.signal_emit; Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.state_set { get; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 8c4789929c..9852f96718 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -219,7 +219,7 @@ apply: else elm_layout_text_set(obj, "elm.text", buf); - efl_access_name_changed_signal_emit(obj); + efl_access_i18n_name_changed_signal_emit(obj); if (sd->entry_visible) _entry_show(sd); } @@ -1682,10 +1682,10 @@ _elm_spinner_efl_access_value_increment_get(Eo *obj EINA_UNUSED, Elm_Spinner_Dat } EOLIAN static const char* -_elm_spinner_efl_access_name_get(Eo *obj, Elm_Spinner_Data *sd) +_elm_spinner_efl_access_i18n_name_get(Eo *obj, Elm_Spinner_Data *sd) { const char *name, *ret; - name = efl_access_name_get(efl_super(obj, ELM_SPINNER_CLASS)); + name = efl_access_i18n_name_get(efl_super(obj, ELM_SPINNER_CLASS)); if (name) return name; if (sd->button_layout) { diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index f0b0dc6955..2c5d6ca51b 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -177,7 +177,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition, Efl.Ui.Range.range_min_max { get; set; } Efl.Ui.Range.range_step { get; set; } Efl.Ui.Range.range_value { get; set; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } Efl.Access.Value.increment { get; } diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index a5a774b7ec..f24eb444b8 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -3873,10 +3873,10 @@ _elm_toolbar_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, } EOLIAN static const char* -_elm_toolbar_item_efl_access_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item) +_elm_toolbar_item_efl_access_i18n_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item) { const char *ret; - ret = efl_access_name_get(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); + ret = efl_access_i18n_name_get(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); if (ret) return ret; return _elm_widget_item_accessible_plain_name_get(eo_item, item->label); } diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo index 5143b8f7e7..ff675bb606 100644 --- a/src/lib/elementary/elm_toolbar_item.eo +++ b/src/lib/elementary/elm_toolbar_item.eo @@ -274,7 +274,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Item, Efl.Ui.Focus.Object, Efl.Ui Elm.Widget.Item.part_content_unset; Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } - Efl.Access.name { get; } + Efl.Access.i18n_name { get; } Efl.Access.state_set { get; } Efl.Ui.Item.selected { get; set; } Efl.Ui.Item.prev { get; } diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c index 63d133c04e..ad4d47dd9e 100644 --- a/src/tests/elementary/elm_test_atspi.c +++ b/src/tests/elementary/elm_test_atspi.c @@ -38,7 +38,7 @@ START_TEST (test_efl_access_app_obj_name_get) elm_app_name_set("Test name"); - ret = efl_access_name_get(root); + ret = efl_access_i18n_name_get(root); ck_assert_str_eq(ret, "Test name"); @@ -47,14 +47,14 @@ START_TEST (test_efl_access_app_obj_name_get) } END_TEST -START_TEST (test_efl_access_name_get) +START_TEST (test_efl_access_i18n_name_get) { elm_init(0, NULL); generate_app(); const char *name; - name = efl_access_name_get(g_btn); + name = efl_access_i18n_name_get(g_btn); if (name && name[0]) { ck_assert(0); @@ -63,7 +63,7 @@ START_TEST (test_efl_access_name_get) // Set name with additional text tags elm_object_text_set(g_btn, "Some
text"); - name = efl_access_name_get(g_btn); + name = efl_access_i18n_name_get(g_btn); // Accessible name should have cleared tags ck_assert(name != NULL); @@ -73,7 +73,7 @@ START_TEST (test_efl_access_name_get) } END_TEST -START_TEST (test_efl_access_name_set) +START_TEST (test_efl_access_i18n_name_set) { elm_init(0, NULL); generate_app(); @@ -81,15 +81,15 @@ START_TEST (test_efl_access_name_set) const char *name; elm_object_text_set(g_btn, "Other text"); - efl_access_name_set(g_btn, "Test name"); + efl_access_i18n_name_set(g_btn, "Test name"); - name = efl_access_name_get(g_btn); + name = efl_access_i18n_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Test name"); - efl_access_name_set(g_btn, NULL); - name = efl_access_name_get(g_btn); + efl_access_i18n_name_set(g_btn, NULL); + name = efl_access_i18n_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Other text"); @@ -483,8 +483,8 @@ END_TEST void elm_test_atspi(TCase *tc) { tcase_add_test(tc, test_efl_access_app_obj_name_get); - tcase_add_test(tc, test_efl_access_name_get); - tcase_add_test(tc, test_efl_access_name_set); + tcase_add_test(tc, test_efl_access_i18n_name_get); + tcase_add_test(tc, test_efl_access_i18n_name_set); tcase_add_test(tc, test_efl_access_role_get); tcase_add_test(tc, test_efl_access_role_set); tcase_add_test(tc, test_efl_access_role_name_get);