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

rename elm_radio to Efl.Ui.Radio 

Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
This commit is contained in:
Amitesh Singh 2017-05-22 18:56:52 +09:00
parent fc803a3320
commit 12b862f8d1
12 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default/base.src.in
View File

@ -2056,7 +2056,7 @@ group "Elm_Config" struct {
} }
} }
group "Elm_Config_Bindings_Widget" struct { group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Radio"; value "name" string: "Efl.Ui.Radio";
group "key_bindings" list { group "key_bindings" list {
group "Elm_Config_Binding_Key" struct { group "Elm_Config_Binding_Key" struct {
value "context" int: 0; value "context" int: 0;

2
config/mobile/base.src.in
View File

@ -2060,7 +2060,7 @@ group "Elm_Config" struct {
} }
} }
group "Elm_Config_Bindings_Widget" struct { group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Radio"; value "name" string: "Efl.Ui.Radio";
group "key_bindings" list { group "key_bindings" list {
group "Elm_Config_Binding_Key" struct { group "Elm_Config_Binding_Key" struct {
value "context" int: 0; value "context" int: 0;

2
config/standard/base.src.in
View File

@ -2057,7 +2057,7 @@ group "Elm_Config" struct {
} }
} }
group "Elm_Config_Bindings_Widget" struct { group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Radio"; value "name" string: "Efl.Ui.Radio";
group "key_bindings" list { group "key_bindings" list {
group "Elm_Config_Binding_Key" struct { group "Elm_Config_Binding_Key" struct {
value "context" int: 0; value "context" int: 0;

2
po/POTFILES.in
View File

@ -151,7 +151,7 @@ src/lib/elementary/elm_plug.c
src/lib/elementary/elm_prefs.c src/lib/elementary/elm_prefs.c
src/lib/elementary/elm_prefs_data.c src/lib/elementary/elm_prefs_data.c
src/lib/elementary/elm_progressbar.c src/lib/elementary/elm_progressbar.c
src/lib/elementary/elm_radio.c src/lib/elementary/efl_ui_radio.c
src/lib/elementary/elm_route.c src/lib/elementary/elm_route.c
src/lib/elementary/elm_scroller.c src/lib/elementary/elm_scroller.c
src/lib/elementary/elm_segment_control.c src/lib/elementary/elm_segment_control.c

8
src/Makefile_Elementary.am
View File

@ -58,7 +58,7 @@ elm_public_eolian_files = \
lib/elementary/elm_plug.eo \ lib/elementary/elm_plug.eo \
lib/elementary/elm_popup.eo \ lib/elementary/elm_popup.eo \
lib/elementary/elm_progressbar.eo \ lib/elementary/elm_progressbar.eo \
lib/elementary/elm_radio.eo \ lib/elementary/efl_ui_radio.eo \
lib/elementary/elm_route.eo \ lib/elementary/elm_route.eo \
lib/elementary/elm_scroller.eo \ lib/elementary/elm_scroller.eo \
lib/elementary/elm_slider.eo \ lib/elementary/elm_slider.eo \
@ -261,7 +261,7 @@ includesunstable_HEADERS = \
lib/elementary/elm_widget_popup.h \ lib/elementary/elm_widget_popup.h \
lib/elementary/elm_widget_prefs.h \ lib/elementary/elm_widget_prefs.h \
lib/elementary/elm_widget_progressbar.h \ lib/elementary/elm_widget_progressbar.h \
lib/elementary/elm_widget_radio.h \ lib/elementary/efl_ui_radio_private.h \
lib/elementary/elm_widget_route.h \ lib/elementary/elm_widget_route.h \
lib/elementary/elm_widget_scroller.h \ lib/elementary/elm_widget_scroller.h \
lib/elementary/elm_widget_segment_control.h \ lib/elementary/elm_widget_segment_control.h \
@ -470,7 +470,7 @@ includesub_HEADERS = \
lib/elementary/elm_progressbar_eo.h \ lib/elementary/elm_progressbar_eo.h \
lib/elementary/elm_progressbar_legacy.h \ lib/elementary/elm_progressbar_legacy.h \
lib/elementary/elm_radio.h \ lib/elementary/elm_radio.h \
lib/elementary/elm_radio_eo.h \ lib/elementary/efl_ui_radio_eo.h \
lib/elementary/elm_radio_legacy.h \ lib/elementary/elm_radio_legacy.h \
lib/elementary/elm_route.h \ lib/elementary/elm_route.h \
lib/elementary/elm_route_eo.h \ lib/elementary/elm_route_eo.h \
@ -629,7 +629,7 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_prefs_data.c \ lib/elementary/elm_prefs_data.c \
lib/elementary/elm_prefs_edd.x \ lib/elementary/elm_prefs_edd.x \
lib/elementary/elm_progressbar.c \ lib/elementary/elm_progressbar.c \
lib/elementary/elm_radio.c \ lib/elementary/efl_ui_radio.c \
lib/elementary/elm_route.c \ lib/elementary/elm_route.c \
lib/elementary/elm_scroller.c \ lib/elementary/elm_scroller.c \
lib/elementary/elm_segment_control.c \ lib/elementary/elm_segment_control.c \

50
src/lib/elementary/elm_radio.c → src/lib/elementary/efl_ui_radio.c
View File

@ -9,12 +9,12 @@
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" #include "elm_priv.h"
#include "elm_widget_radio.h" #include "efl_ui_radio_private.h"
#include "elm_widget_layout.h" #include "elm_widget_layout.h"
#define MY_CLASS ELM_RADIO_CLASS #define MY_CLASS EFL_UI_RADIO_CLASS
#define MY_CLASS_NAME "Elm_Radio" #define MY_CLASS_NAME "Efl.Ui.Radio"
#define MY_CLASS_NAME_LEGACY "elm_radio" #define MY_CLASS_NAME_LEGACY "elm_radio"
static const Elm_Layout_Part_Alias_Description _text_aliases[] = static const Elm_Layout_Part_Alias_Description _text_aliases[] =
@ -79,7 +79,7 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
} }
static void static void
_state_set_all(Elm_Radio_Data *sd, Eina_Bool activate) _state_set_all(Efl_Ui_Radio_Data *sd, Eina_Bool activate)
{ {
const Eina_List *l; const Eina_List *l;
Eina_Bool disabled = EINA_FALSE; Eina_Bool disabled = EINA_FALSE;
@ -132,7 +132,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_radio_elm_widget_widget_event(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) _efl_ui_radio_elm_widget_widget_event(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
{ {
(void) src; (void) src;
Evas_Event_Key_Down *ev = event_info; Evas_Event_Key_Down *ev = event_info;
@ -164,7 +164,7 @@ _icon_signal_emit(Evas_Object *obj)
} }
EOLIAN static Elm_Theme_Apply EOLIAN static Elm_Theme_Apply
_elm_radio_elm_widget_theme_apply(Eo *obj, Elm_Radio_Data *sd) _efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
@ -220,7 +220,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
} }
EOLIAN static void EOLIAN static void
_elm_radio_efl_canvas_group_group_add(Eo *obj, Elm_Radio_Data *priv) _efl_ui_radio_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Radio_Data *priv)
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -250,7 +250,7 @@ _elm_radio_efl_canvas_group_group_add(Eo *obj, Elm_Radio_Data *priv)
} }
EOLIAN static void EOLIAN static void
_elm_radio_efl_canvas_group_group_del(Eo *obj, Elm_Radio_Data *sd) _efl_ui_radio_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Radio_Data *sd)
{ {
sd->group->radios = eina_list_remove(sd->group->radios, obj); sd->group->radios = eina_list_remove(sd->group->radios, obj);
if (!sd->group->radios) free(sd->group); if (!sd->group->radios) free(sd->group);
@ -259,7 +259,7 @@ _elm_radio_efl_canvas_group_group_del(Eo *obj, Elm_Radio_Data *sd)
} }
EOLIAN static const Elm_Layout_Part_Alias_Description* EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_radio_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Radio_Data *_pd EINA_UNUSED) _efl_ui_radio_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *_pd EINA_UNUSED)
{ {
return _text_aliases; return _text_aliases;
} }
@ -273,7 +273,7 @@ elm_radio_add(Evas_Object *parent)
} }
EOLIAN static Eo * EOLIAN static Eo *
_elm_radio_efl_object_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED) _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED)
{ {
obj = efl_constructor(efl_super(obj, MY_CLASS)); obj = efl_constructor(efl_super(obj, MY_CLASS));
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@ -284,7 +284,7 @@ _elm_radio_efl_object_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
} }
EOLIAN static void EOLIAN static void
_elm_radio_group_add(Eo *obj, Elm_Radio_Data *sd, Evas_Object *group) _efl_ui_radio_group_add(Eo *obj, Efl_Ui_Radio_Data *sd, Evas_Object *group)
{ {
ELM_RADIO_DATA_GET(group, sdg); ELM_RADIO_DATA_GET(group, sdg);
@ -309,7 +309,7 @@ _elm_radio_group_add(Eo *obj, Elm_Radio_Data *sd, Evas_Object *group)
} }
EOLIAN static void EOLIAN static void
_elm_radio_state_value_set(Eo *obj, Elm_Radio_Data *sd, int value) _efl_ui_radio_state_value_set(Eo *obj, Efl_Ui_Radio_Data *sd, int value)
{ {
sd->value = value; sd->value = value;
if (sd->value == sd->group->value) _state_set(obj, EINA_TRUE, EINA_FALSE); if (sd->value == sd->group->value) _state_set(obj, EINA_TRUE, EINA_FALSE);
@ -317,13 +317,13 @@ _elm_radio_state_value_set(Eo *obj, Elm_Radio_Data *sd, int value)
} }
EOLIAN static int EOLIAN static int
_elm_radio_state_value_get(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd) _efl_ui_radio_state_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd)
{ {
return sd->value; return sd->value;
} }
EOLIAN static void EOLIAN static void
_elm_radio_value_set(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd, int value) _efl_ui_radio_value_set(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd, int value)
{ {
if (value == sd->group->value) return; if (value == sd->group->value) return;
sd->group->value = value; sd->group->value = value;
@ -332,13 +332,13 @@ _elm_radio_value_set(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd, int value)
} }
EOLIAN static int EOLIAN static int
_elm_radio_value_get(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd) _efl_ui_radio_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd)
{ {
return sd->group->value; return sd->group->value;
} }
EOLIAN static void EOLIAN static void
_elm_radio_value_pointer_set(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd, int *valuep) _efl_ui_radio_value_pointer_set(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd, int *valuep)
{ {
if (valuep) if (valuep)
{ {
@ -353,7 +353,7 @@ _elm_radio_value_pointer_set(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd, int *value
} }
EOLIAN static Evas_Object* EOLIAN static Evas_Object*
_elm_radio_selected_object_get(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd) _efl_ui_radio_selected_object_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd)
{ {
Eina_List *l; Eina_List *l;
Evas_Object *child; Evas_Object *child;
@ -369,7 +369,7 @@ _elm_radio_selected_object_get(Eo *obj EINA_UNUSED, Elm_Radio_Data *sd)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_radio_elm_widget_activate(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, Elm_Activate act) _efl_ui_radio_elm_widget_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Elm_Activate act)
{ {
if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (elm_widget_disabled_get(obj)) return EINA_FALSE;
if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
@ -380,13 +380,13 @@ _elm_radio_elm_widget_activate(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, Elm_Act
} }
EOLIAN static void EOLIAN static void
_elm_radio_class_constructor(Efl_Class *klass) _efl_ui_radio_class_constructor(Efl_Class *klass)
{ {
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Atspi_Action * EOLIAN const Elm_Atspi_Action *
_elm_radio_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Radio_Data *pd EINA_UNUSED) _efl_ui_radio_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *pd EINA_UNUSED)
{ {
static Elm_Atspi_Action atspi_actions[] = { static Elm_Atspi_Action atspi_actions[] = {
{ "activate", "activate", NULL, _key_action_activate}, { "activate", "activate", NULL, _key_action_activate},
@ -396,11 +396,11 @@ _elm_radio_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
} }
EOLIAN Elm_Atspi_State_Set EOLIAN Elm_Atspi_State_Set
_elm_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Radio_Data *pd EINA_UNUSED) _efl_ui_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED)
{ {
Elm_Atspi_State_Set ret; Elm_Atspi_State_Set ret;
ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_RADIO_CLASS)); ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS));
if (obj == elm_radio_selected_object_get(obj)) if (obj == elm_radio_selected_object_get(obj))
STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED); STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED);
@ -409,7 +409,7 @@ _elm_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Radio_Data
/* Internal EO APIs and hidden overrides */ /* Internal EO APIs and hidden overrides */
#define ELM_RADIO_EXTRA_OPS \ #define EFL_UI_RADIO_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_radio) EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio)
#include "elm_radio.eo.c" #include "efl_ui_radio.eo.c"

6
src/lib/elementary/elm_radio.eo → src/lib/elementary/efl_ui_radio.eo
View File

@ -1,8 +1,8 @@
class Elm.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action) class Efl.Ui.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action)
{ {
[[Elementary radio class]] [[Elementary radio class]]
legacy_prefix: elm_radio; legacy_prefix: elm_radio;
eo_prefix: elm_obj_radio; //eo_prefix: elm_obj_radio;
event_prefix: elm_radio; event_prefix: elm_radio;
methods { methods {
@property state_value { @property state_value {
@ -71,7 +71,7 @@ class Elm.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action)
]] ]]
params { params {
@in group: Elm.Radio; [[Any radio object whose group the obj is @in group: Efl.Ui.Radio; [[Any radio object whose group the obj is
to join.]] to join.]]
} }
} }

1
src/lib/elementary/efl_ui_radio_eo.h Normal file
View File

@ -0,0 +1 @@
#include "efl_ui_radio.eo.h"

12
src/lib/elementary/elm_widget_radio.h → src/lib/elementary/efl_ui_radio_private.h
View File

@ -1,5 +1,5 @@
#ifndef ELM_WIDGET_RADIO_H #ifndef EFL_UI_RADIO_PRIVATE_H
#define ELM_WIDGET_RADIO_H #define EFL_UI_RADIO_PRIVATE_H
#include "Elementary.h" #include "Elementary.h"
@ -23,7 +23,7 @@
/** /**
* Base layout smart data extended with radio instance data. * Base layout smart data extended with radio instance data.
*/ */
typedef struct _Elm_Radio_Data Elm_Radio_Data; typedef struct _Efl_Ui_Radio_Data Efl_Ui_Radio_Data;
typedef struct _Group Group; typedef struct _Group Group;
struct _Group struct _Group
@ -33,7 +33,7 @@ struct _Group
Eina_List *radios; Eina_List *radios;
}; };
struct _Elm_Radio_Data struct _Efl_Ui_Radio_Data
{ {
int value; int value;
Eina_Bool state; Eina_Bool state;
@ -46,7 +46,7 @@ struct _Elm_Radio_Data
*/ */
#define ELM_RADIO_DATA_GET(o, sd) \ #define ELM_RADIO_DATA_GET(o, sd) \
Elm_Radio_Data * sd = efl_data_scope_get(o, ELM_RADIO_CLASS) Efl_Ui_Radio_Data * sd = efl_data_scope_get(o, EFL_UI_RADIO_CLASS)
#define ELM_RADIO_DATA_GET_OR_RETURN(o, ptr) \ #define ELM_RADIO_DATA_GET_OR_RETURN(o, ptr) \
ELM_RADIO_DATA_GET(o, ptr); \ ELM_RADIO_DATA_GET(o, ptr); \
@ -67,7 +67,7 @@ struct _Elm_Radio_Data
} }
#define ELM_RADIO_CHECK(obj) \ #define ELM_RADIO_CHECK(obj) \
if (EINA_UNLIKELY(!efl_isa((obj), ELM_RADIO_CLASS))) \ if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_RADIO_CLASS))) \
return return
#endif #endif

2
src/lib/elementary/elm_radio.h
View File

@ -65,7 +65,7 @@
*/ */
#ifdef EFL_EO_API_SUPPORT #ifdef EFL_EO_API_SUPPORT
#include "elm_radio_eo.h" #include "efl_ui_radio_eo.h"
#endif #endif
#ifndef EFL_NOLEGACY_API_SUPPORT #ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_radio_legacy.h" #include "elm_radio_legacy.h"

1
src/lib/elementary/elm_radio_eo.h
View File

@ -1 +0,0 @@
#include "elm_radio.eo.h"

2
src/lib/elementary/elm_radio_legacy.h
View File

@ -8,4 +8,4 @@
*/ */
EAPI Evas_Object *elm_radio_add(Evas_Object *parent); EAPI Evas_Object *elm_radio_add(Evas_Object *parent);
#include "elm_radio.eo.legacy.h" #include "efl_ui_radio.eo.legacy.h"