diff --git a/src/lib/elementary/efl_access_action.c b/src/lib/elementary/efl_access_action.c index 92b62f8b9f..a6aba74f33 100644 --- a/src/lib/elementary/efl_access_action.c +++ b/src/lib/elementary/efl_access_action.c @@ -3,13 +3,14 @@ #endif #define EFL_ACCESS_ACTION_PROTECTED +#define EFL_ACCESS_ACTION_BETA #include #include "elm_widget.h" #include "elm_priv.h" EOLIAN const char * -_efl_access_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id) +_efl_access_action_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id) { const char *ret = NULL; diff --git a/src/lib/elementary/efl_access_action.eo b/src/lib/elementary/efl_access_action.eo index d31fb61f0c..ca5d3457d8 100644 --- a/src/lib/elementary/efl_access_action.eo +++ b/src/lib/elementary/efl_access_action.eo @@ -6,7 +6,7 @@ mixin Efl.Access.Action () [[Accessible action mixin]] data: null; methods { - @property name @protected @pure_virtual { + @property action_name @protected @pure_virtual @beta { [[Gets action name for given id]] get { } @@ -17,7 +17,7 @@ mixin Efl.Access.Action () id: int; [[ID to get action name for]] } } - @property localized_name @protected { + @property action_localized_name @protected @beta { [[Gets localized action name for given id]] get { } @@ -28,7 +28,7 @@ mixin Efl.Access.Action () id: int; [[ID to get localized name for]] } } - @property description @protected @pure_virtual { + @property action_description @protected @pure_virtual @beta { [[Action description for given id]] get { } @@ -42,7 +42,7 @@ mixin Efl.Access.Action () id: int; [[ID to set or get description for]] } } - @property actions @protected { + @property actions @protected @beta { [[Get list of available widget actions]] get @pure_virtual { } @@ -50,14 +50,14 @@ mixin Efl.Access.Action () actions: list; [[Contains statically allocated strings]] } } - action_do @protected @pure_virtual { + action_do @protected @pure_virtual @beta { [[Performs action on given widget.]] params { @in id: int; [[ID for widget]] } return: bool; [[$true if action was performed, $false otherwise]] } - keybinding_get @protected @pure_virtual { + action_keybinding_get @protected @pure_virtual @beta { [[Gets configured keybinding for specific action and widget.]] params { @in id: int; [[ID for widget]] diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 3d3b3ff521..c8681932e5 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -11,6 +11,8 @@ #define EFL_ACCESS_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED +#define EFL_ACCESS_ACTION_BETA + #include "atspi/atspi-constants.h" #include diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.c b/src/lib/elementary/elm_interface_atspi_widget_action.c index 66f3891a13..aee335b16f 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.c +++ b/src/lib/elementary/elm_interface_atspi_widget_action.c @@ -4,6 +4,7 @@ #define EFL_ACCESS_ACTION_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_ACTION_BETA #include #include "elm_widget.h" @@ -40,7 +41,7 @@ _elm_interface_atspi_widget_action_efl_access_action_action_do(Eo *obj, void *pd } EOLIAN static char* -_elm_interface_atspi_widget_action_efl_access_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id) +_elm_interface_atspi_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id) { const Elm_Atspi_Action *actions = NULL; Eina_List *l1, *binding_list; @@ -93,7 +94,7 @@ _elm_interface_atspi_widget_action_efl_access_action_keybinding_get(Eo *obj, voi } EOLIAN static const char * -_elm_interface_atspi_widget_action_efl_access_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id) +_elm_interface_atspi_widget_action_efl_access_action_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id) { const Elm_Atspi_Action *actions = NULL; int tmp = 0; @@ -110,13 +111,13 @@ _elm_interface_atspi_widget_action_efl_access_action_name_get(Eo *obj, void *pd } EOLIAN static Eina_Bool -_elm_interface_atspi_widget_action_efl_access_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED) +_elm_interface_atspi_widget_action_efl_access_action_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED) { return EINA_FALSE; } EOLIAN static const char * -_elm_interface_atspi_widget_action_efl_access_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED) +_elm_interface_atspi_widget_action_efl_access_action_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED) { return NULL; } diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo index 869ccc547d..9d0ce3458b 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.eo +++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo @@ -17,9 +17,9 @@ mixin Elm.Interface.Atspi_Widget_Action (Efl.Access.Action) } implements { Efl.Access.Action.action_do; - Efl.Access.Action.keybinding_get; - Efl.Access.Action.name { get; } - Efl.Access.Action.description { get; set; } + Efl.Access.Action.action_keybinding_get; + Efl.Access.Action.action_name { get; } + Efl.Access.Action.action_description { get; set; } Efl.Access.Action.actions { get; } } }