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

rename elm_button to Efl.Ui.Button 

ref T5323

Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
This commit is contained in:
Amitesh Singh 2017-05-22 12:48:12 +09:00
parent c8ec1cb2af
commit 850498e977
25 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,7 +608,7 @@ group "Elm_Config" struct {
} }
} }
group "Elm_Config_Bindings_Widget" struct { group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Button"; value "name" string: "Efl.Ui.Button";
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

@ -612,7 +612,7 @@ group "Elm_Config" struct {
} }
} }
group "Elm_Config_Bindings_Widget" struct { group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Button"; value "name" string: "Efl.Ui.Button";
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

@ -609,7 +609,7 @@ group "Elm_Config" struct {
} }
} }
group "Elm_Config_Bindings_Widget" struct { group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Button"; value "name" string: "Efl.Ui.Button";
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

@ -105,7 +105,7 @@ src/lib/elementary/elm_actionslider.c
src/lib/elementary/elm_bg.c src/lib/elementary/elm_bg.c
src/lib/elementary/elm_box.c src/lib/elementary/elm_box.c
src/lib/elementary/elm_bubble.c src/lib/elementary/elm_bubble.c
src/lib/elementary/elm_button.c src/lib/elementary/efl_ui_button.c
src/lib/elementary/elm_calendar.c src/lib/elementary/elm_calendar.c
src/lib/elementary/efl_ui_check.c src/lib/elementary/efl_ui_check.c
src/lib/elementary/elm_clock.c src/lib/elementary/elm_clock.c

10
src/Makefile_Elementary.am
View File

@ -5,7 +5,7 @@ elm_public_eolian_files = \
lib/elementary/elm_atspi_bridge.eo \ lib/elementary/elm_atspi_bridge.eo \
lib/elementary/elm_atspi_app_object.eo \ lib/elementary/elm_atspi_app_object.eo \
lib/elementary/elm_bg.eo \ lib/elementary/elm_bg.eo \
lib/elementary/elm_button.eo \ lib/elementary/efl_ui_button.eo \
lib/elementary/elm_calendar.eo \ lib/elementary/elm_calendar.eo \
lib/elementary/efl_ui_check.eo \ lib/elementary/efl_ui_check.eo \
lib/elementary/elm_clock.eo \ lib/elementary/elm_clock.eo \
@ -94,7 +94,7 @@ elm_public_eolian_files = \
lib/elementary/efl_ui_grid_static.eo \ lib/elementary/efl_ui_grid_static.eo \
lib/elementary/efl_ui_layout_internal_box.eo \ lib/elementary/efl_ui_layout_internal_box.eo \
lib/elementary/efl_ui_layout_internal_table.eo \ lib/elementary/efl_ui_layout_internal_table.eo \
lib/elementary/elm_button_internal_part.eo \ lib/elementary/efl_ui_button_internal_part.eo \
lib/elementary/elm_ctxpopup_internal_part.eo \ lib/elementary/elm_ctxpopup_internal_part.eo \
lib/elementary/elm_dayselector_internal_part.eo \ lib/elementary/elm_dayselector_internal_part.eo \
lib/elementary/elm_entry_internal_part.eo \ lib/elementary/elm_entry_internal_part.eo \
@ -215,7 +215,7 @@ includesunstable_HEADERS = \
lib/elementary/elm_widget_bg.h \ lib/elementary/elm_widget_bg.h \
lib/elementary/elm_widget_box.h \ lib/elementary/elm_widget_box.h \
lib/elementary/elm_widget_bubble.h \ lib/elementary/elm_widget_bubble.h \
lib/elementary/elm_widget_button.h \ lib/elementary/efl_ui_button_private.h \
lib/elementary/elm_widget_calendar.h \ lib/elementary/elm_widget_calendar.h \
lib/elementary/efl_ui_check_private.h \ lib/elementary/efl_ui_check_private.h \
lib/elementary/elm_widget_clock.h \ lib/elementary/elm_widget_clock.h \
@ -333,7 +333,7 @@ includesub_HEADERS = \
lib/elementary/elm_bubble.h \ lib/elementary/elm_bubble.h \
lib/elementary/elm_bubble_legacy.h \ lib/elementary/elm_bubble_legacy.h \
lib/elementary/elm_button.h \ lib/elementary/elm_button.h \
lib/elementary/elm_button_eo.h \ lib/elementary/efl_ui_button_eo.h \
lib/elementary/elm_button_legacy.h \ lib/elementary/elm_button_legacy.h \
lib/elementary/elm_cache.h \ lib/elementary/elm_cache.h \
lib/elementary/elm_calendar.h \ lib/elementary/elm_calendar.h \
@ -553,7 +553,7 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_bg.c \ lib/elementary/elm_bg.c \
lib/elementary/elm_box.c \ lib/elementary/elm_box.c \
lib/elementary/elm_bubble.c \ lib/elementary/elm_bubble.c \
lib/elementary/elm_button.c \ lib/elementary/efl_ui_button.c \
lib/elementary/elm_calendar.c \ lib/elementary/elm_calendar.c \
lib/elementary/efl_ui_check.c \ lib/elementary/efl_ui_check.c \
lib/elementary/elm_clock.c \ lib/elementary/elm_clock.c \

2
src/bin/elementary/test_efl_ui_text.c
View File

@ -84,7 +84,7 @@ my_efl_ui_text_anchor_hover_opened(void *data EINA_UNUSED, const Efl_Event *even
Efl_Ui_Text_Anchor_Hover_Info *ei = event->info; Efl_Ui_Text_Anchor_Hover_Info *ei = event->info;
bt = efl_add(ELM_BUTTON_CLASS, en); bt = efl_add(EFL_UI_BUTTON_CLASS, en);
elm_object_text_set(bt, ei->anchor_info->name); elm_object_text_set(bt, ei->anchor_info->name);
evas_object_show(bt); evas_object_show(bt);
elm_object_part_content_set(ei->hover, "middle", bt); elm_object_part_content_set(ei->hover, "middle", bt);

6
src/bin/elementary/test_evas_mask.c
View File

@ -164,19 +164,19 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
// FIXME: button EO API // FIXME: button EO API
efl_add(ELM_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle mask"), efl_text_set(efl_added, "Toggle mask"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly),
efl_pack(box2, efl_added), efl_pack(box2, efl_added),
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
efl_add(ELM_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle map"), efl_text_set(efl_added, "Toggle map"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly),
efl_pack(box2, efl_added), efl_pack(box2, efl_added),
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
efl_add(ELM_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Rotate Window"), efl_text_set(efl_added, "Rotate Window"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win),
efl_pack(box2, efl_added), efl_pack(box2, efl_added),

8
src/bin/elementary/test_evas_snapshot.c
View File

@ -190,7 +190,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1), efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1),
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
efl_add(ELM_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle animation"), efl_text_set(efl_added, "Toggle animation"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@ -198,7 +198,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win),
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
efl_add(ELM_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Save to file"), efl_text_set(efl_added, "Save to file"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@ -206,7 +206,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win),
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
efl_add(ELM_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Map"), efl_text_set(efl_added, "Map"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@ -214,7 +214,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win),
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
efl_add(ELM_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Close"), efl_text_set(efl_added, "Close"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),

2
src/bin/elementary/test_gfx_filters.c
View File

@ -368,7 +368,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_visible_set(efl_added, 1)); efl_gfx_visible_set(efl_added, 1));
efl_pack(box2, o); efl_pack(box2, o);
o = efl_add(ELM_BUTTON_CLASS, win, o = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Flip"), efl_text_set(efl_added, "Flip"),
efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5), efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5),

2
src/examples/elementary/button_cxx_example_00.cc
View File

@ -23,7 +23,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)
// win.title_set("Hello, World!"); // win.title_set("Hello, World!");
win.autohide_set(true); win.autohide_set(true);
::elm::Button btn(win); efl::ui::Button btn(win);
btn.eo_cxx::elm::Layout::text_set(nullptr,"Good-Bye, World!"); btn.eo_cxx::elm::Layout::text_set(nullptr,"Good-Bye, World!");
btn.eo_cxx::efl::Gfx::size_set(120, 30); btn.eo_cxx::efl::Gfx::size_set(120, 30);
btn.eo_cxx::efl::Gfx::position_set(60, 15); btn.eo_cxx::efl::Gfx::position_set(60, 15);

68
src/lib/elementary/elm_button.c → src/lib/elementary/efl_ui_button.c
View File

@ -8,14 +8,14 @@
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" #include "elm_priv.h"
#include "elm_widget_button.h" #include "efl_ui_button_private.h"
#include "elm_widget_layout.h" #include "elm_widget_layout.h"
#include "elm_button_internal_part.eo.h" #include "efl_ui_button_internal_part.eo.h"
#include "elm_part_helper.h" #include "elm_part_helper.h"
#define MY_CLASS ELM_BUTTON_CLASS #define MY_CLASS EFL_UI_BUTTON_CLASS
#define MY_CLASS_NAME "Elm_Button" #define MY_CLASS_NAME "Efl.Ui.Button"
#define MY_CLASS_NAME_LEGACY "elm_button" #define MY_CLASS_NAME_LEGACY "elm_button"
static const char SIG_CLICKED[] = "clicked"; static const char SIG_CLICKED[] = "clicked";
@ -75,7 +75,7 @@ _activate(Evas_Object *obj)
} }
EOLIAN static void EOLIAN static void
_elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw = -1, minh = -1; Evas_Coord minw = -1, minh = -1;
@ -87,7 +87,7 @@ _elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_Activate act) _efl_ui_button_elm_widget_activate(Eo *obj, Efl_Ui_Button_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;
@ -120,7 +120,7 @@ _icon_signal_emit(Evas_Object *obj)
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
* can changed the theme API */ * can changed the theme API */
EOLIAN static Elm_Theme_Apply EOLIAN static Elm_Theme_Apply
_elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
@ -135,7 +135,7 @@ _elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
* can changed the theme API */ * can changed the theme API */
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj) _efl_ui_button_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj)
{ {
Eina_Bool int_ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE;
@ -151,7 +151,7 @@ _elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
* is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
* can changed the theme API */ * can changed the theme API */
static Eina_Bool static Eina_Bool
_elm_button_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) _efl_ui_button_content_set(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
{ {
Eina_Bool int_ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE;
@ -172,7 +172,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_button_elm_widget_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) _efl_ui_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Button_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;
@ -281,7 +281,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
} }
EOLIAN static void EOLIAN static void
_elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -312,13 +312,13 @@ _elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED
} }
EOLIAN static const Elm_Layout_Part_Alias_Description* EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
return _content_aliases; return _content_aliases;
} }
EOLIAN static const Elm_Layout_Part_Alias_Description* EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
return _text_aliases; return _text_aliases;
} }
@ -332,7 +332,7 @@ elm_button_add(Evas_Object *parent)
} }
EOLIAN static Eo * EOLIAN static Eo *
_elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_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);
@ -343,7 +343,7 @@ _elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
} }
EOLIAN static void EOLIAN static void
_elm_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Elm_Button_Data *sd, Eina_Bool on) _efl_ui_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *sd, Eina_Bool on)
{ {
ELM_SAFE_FREE(sd->timer, ecore_timer_del); ELM_SAFE_FREE(sd->timer, ecore_timer_del);
sd->autorepeat = on; sd->autorepeat = on;
@ -351,10 +351,10 @@ _elm_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Elm_Bu
} }
#define _AR_CAPABLE(obj) \ #define _AR_CAPABLE(obj) \
(_internal_elm_button_autorepeat_supported_get(obj)) (_internal_efl_ui_button_autorepeat_supported_get(obj))
static Eina_Bool static Eina_Bool
_internal_elm_button_autorepeat_supported_get(const Evas_Object *obj) _internal_efl_ui_button_autorepeat_supported_get(const Evas_Object *obj)
{ {
Eina_Bool ret = EINA_FALSE; Eina_Bool ret = EINA_FALSE;
ret = efl_ui_autorepeat_supported_get(obj); ret = efl_ui_autorepeat_supported_get(obj);
@ -362,19 +362,19 @@ _internal_elm_button_autorepeat_supported_get(const Evas_Object *obj)
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_button_efl_ui_autorepeat_autorepeat_supported_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_efl_ui_autorepeat_autorepeat_supported_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
return EINA_TRUE; return EINA_TRUE;
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_button_efl_ui_autorepeat_autorepeat_enabled_get(Eo *obj, Elm_Button_Data *sd) _efl_ui_button_efl_ui_autorepeat_autorepeat_enabled_get(Eo *obj, Efl_Ui_Button_Data *sd)
{ {
return (_AR_CAPABLE(obj) & sd->autorepeat); return (_AR_CAPABLE(obj) & sd->autorepeat);
} }
EOLIAN static void EOLIAN static void
_elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Elm_Button_Data *sd, double t) _efl_ui_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Efl_Ui_Button_Data *sd, double t)
{ {
if (!_AR_CAPABLE(obj)) if (!_AR_CAPABLE(obj))
{ {
@ -388,7 +388,7 @@ _elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Elm_Button
} }
EOLIAN static double EOLIAN static double
_elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Elm_Button_Data *sd) _efl_ui_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Efl_Ui_Button_Data *sd)
{ {
if (!_AR_CAPABLE(obj)) if (!_AR_CAPABLE(obj))
return 0.0; return 0.0;
@ -397,7 +397,7 @@ _elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Elm_Button
} }
EOLIAN static void EOLIAN static void
_elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Elm_Button_Data *sd, double t) _efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Efl_Ui_Button_Data *sd, double t)
{ {
if (!_AR_CAPABLE(obj)) if (!_AR_CAPABLE(obj))
{ {
@ -412,25 +412,25 @@ _elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Elm_Button_Dat
} }
EOLIAN static double EOLIAN static double
_elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, Elm_Button_Data *sd) _efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *sd)
{ {
return sd->ar_gap_timeout; return sd->ar_gap_timeout;
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_button_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
return EINA_FALSE; return EINA_FALSE;
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_elm_button_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) _efl_ui_button_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{ {
return EINA_FALSE; return EINA_FALSE;
} }
EOLIAN const Elm_Atspi_Action * EOLIAN const Elm_Atspi_Action *
_elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Button_Data *pd EINA_UNUSED) _efl_ui_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_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 },
@ -440,18 +440,18 @@ _elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
} }
static void static void
_elm_button_class_constructor(Efl_Class *klass) _efl_ui_button_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);
} }
EFL_TEXT_DEFAULT_IMPLEMENT(elm_button, Elm_Button_Data) EFL_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
/* Efl.Part begin */ /* Efl.Part begin */
ELM_PART_OVERRIDE(elm_button, ELM_BUTTON, ELM_LAYOUT, Elm_Button_Data, Elm_Part_Data) ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_button, ELM_BUTTON, ELM_LAYOUT, Elm_Button_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
#include "elm_button_internal_part.eo.c" #include "efl_ui_button_internal_part.eo.c"
/* Efl.Part end */ /* Efl.Part end */
@ -493,7 +493,7 @@ elm_button_autorepeat_get(const Evas_Object *obj)
/* Internal EO APIs and hidden overrides */ /* Internal EO APIs and hidden overrides */
#define ELM_BUTTON_EXTRA_OPS \ #define EFL_UI_BUTTON_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(elm_button) EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
#include "elm_button.eo.c" #include "efl_ui_button.eo.c"

3
src/lib/elementary/elm_button.eo → src/lib/elementary/efl_ui_button.eo
View File

@ -1,4 +1,4 @@
class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text, class Efl.Ui.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
Elm.Interface.Atspi_Widget_Action) Elm.Interface.Atspi_Widget_Action)
{ {
[[Push-button widget [[Push-button widget
@ -7,7 +7,6 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
and it also has an autorepeat feature. and it also has an autorepeat feature.
]] ]]
legacy_prefix: elm_button; legacy_prefix: elm_button;
eo_prefix: elm_obj_button;
methods { methods {
} }
implements { implements {

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

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

2
src/lib/elementary/elm_button_internal_part.eo → src/lib/elementary/efl_ui_button_internal_part.eo
View File

@ -1,4 +1,4 @@
class Elm.Button.Internal.Part (Elm.Layout.Internal.Part) class Efl.Ui.Button.Internal.Part (Elm.Layout.Internal.Part)
{ {
[[Elementary button internal part class]] [[Elementary button internal part class]]
data: null; data: null;

12
src/lib/elementary/elm_widget_button.h → src/lib/elementary/efl_ui_button_private.h
View File

@ -1,5 +1,5 @@
#ifndef ELM_WIDGET_BUTTON_H #ifndef EFL_UI_BUTTON_PRIVATE_H
#define ELM_WIDGET_BUTTON_H #define EFL_UI_BUTTON_PRIVATE_H
#include "Elementary.h" #include "Elementary.h"
@ -24,7 +24,7 @@
/** /**
* Base widget smart data extended with button instance data. * Base widget smart data extended with button instance data.
*/ */
typedef struct _Elm_Button_Data typedef struct _Efl_Ui_button_Data
{ {
/* auto-repeat stuff */ /* auto-repeat stuff */
double ar_initial_timeout; /**< Time to wait until first auto-repeated click is generated */ double ar_initial_timeout; /**< Time to wait until first auto-repeated click is generated */
@ -34,14 +34,14 @@ typedef struct _Elm_Button_Data
Eina_Bool autorepeat : 1; /**< Whether auto-repetition of clicks is enabled or not (bound to _Elm_Button_Smart_Class::admits_autorepeat) */ Eina_Bool autorepeat : 1; /**< Whether auto-repetition of clicks is enabled or not (bound to _Elm_Button_Smart_Class::admits_autorepeat) */
Eina_Bool repeating : 1; /**< Whether auto-repetition is going on */ Eina_Bool repeating : 1; /**< Whether auto-repetition is going on */
} Elm_Button_Data; } Efl_Ui_Button_Data;
/** /**
* @} * @}
*/ */
#define ELM_BUTTON_DATA_GET(o, sd) \ #define ELM_BUTTON_DATA_GET(o, sd) \
Elm_Button_Data * sd = efl_data_scope_get(o, ELM_BUTTON_CLASS) Efl_Ui_Button_Data * sd = efl_data_scope_get(o, EFL_UI_BUTTON_CLASS)
#define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr) \ #define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr) \
ELM_BUTTON_DATA_GET(o, ptr); \ ELM_BUTTON_DATA_GET(o, ptr); \
@ -62,7 +62,7 @@ typedef struct _Elm_Button_Data
} }
#define ELM_BUTTON_CHECK(obj) \ #define ELM_BUTTON_CHECK(obj) \
if (EINA_UNLIKELY(!efl_isa((obj), ELM_BUTTON_CLASS))) \ if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_BUTTON_CLASS))) \
return return
#endif #endif

2
src/lib/elementary/efl_ui_nstate.c
View File

@ -6,7 +6,7 @@
#include "Elementary.h" #include "Elementary.h"
#include "elm_priv.h" #include "elm_priv.h"
#include "efl_ui_nstate.eo.h" #include "efl_ui_nstate.eo.h"
#include "elm_widget_button.h" #include "efl_ui_button_private.h"
#define MY_CLASS EFL_UI_NSTATE_CLASS #define MY_CLASS EFL_UI_NSTATE_CLASS
#define MY_CLASS_NAME "Efl.Ui.Nstate" #define MY_CLASS_NAME "Efl.Ui.Nstate"

2
src/lib/elementary/efl_ui_nstate.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Nstate(Elm.Button) class Efl.Ui.Nstate(Efl.Ui.Button)
{ {
[[Efl UI nstate class]] [[Efl UI nstate class]]
methods { methods {

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

@ -68,7 +68,7 @@
*/ */
#ifdef EFL_EO_API_SUPPORT #ifdef EFL_EO_API_SUPPORT
#include "elm_button_eo.h" #include "efl_ui_button_eo.h"
#endif #endif
#ifndef EFL_NOLEGACY_API_SUPPORT #ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_button_legacy.h" #include "elm_button_legacy.h"

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

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

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

@ -108,4 +108,4 @@ EAPI void elm_button_autorepeat_set(Evas_Object *obj, Ein
*/ */
EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj); EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj);
#include "elm_button.eo.legacy.h" #include "efl_ui_button.eo.legacy.h"

2
src/lib/elementary/elm_combobox.eo
View File

@ -1,4 +1,4 @@
class Elm.Combobox (Elm.Button, Efl.Ui.Selectable, class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi_Widget_Action,
Elm.Entry, Elm.Genlist, Elm.Hover) Elm.Entry, Elm.Genlist, Elm.Hover)
{ {

2
src/lib/elementary/elm_fileselector_button.eo
View File

@ -1,4 +1,4 @@
class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector) class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector)
{ {
[[Elementary fileselector button class]] [[Elementary fileselector button class]]
event_prefix: elm_fileselector_button; event_prefix: elm_fileselector_button;

2
src/lib/elementary/elm_hoversel.eo
View File

@ -1,6 +1,6 @@
import elm_general; import elm_general;
class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable, class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable,
Efl.Ui.Clickable, Efl.Ui.Clickable,
Elm.Interface.Atspi_Widget_Action) Elm.Interface.Atspi_Widget_Action)
{ {

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

@ -133,7 +133,7 @@ _ ## type ## _efl_text_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *text)
} \ } \
\ \
EOLIAN static const char * \ EOLIAN static const char * \
_ ## type ## _efl_text_text_get(Eo *obj, Elm_Button_Data *pd EINA_UNUSED) \ _ ## type ## _efl_text_text_get(Eo *obj, Efl_Ui_Button_Data *pd EINA_UNUSED) \
{ \ { \
return elm_layout_text_get(obj, NULL); \ return elm_layout_text_get(obj, NULL); \
} }

4
src/tests/elementary/elm_test_layout.c
View File

@ -37,7 +37,7 @@ START_TEST(elm_layout_swallows)
elm_layout_file_set(ly, buf, "layout"); elm_layout_file_set(ly, buf, "layout");
evas_object_show(ly); evas_object_show(ly);
bt = efl_add(ELM_BUTTON_CLASS, ly); bt = efl_add(EFL_UI_BUTTON_CLASS, ly);
fail_if(!efl_content_set(efl_part(ly, "element1"), bt)); fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
ck_assert_ptr_eq(efl_parent_get(bt), ly); ck_assert_ptr_eq(efl_parent_get(bt), ly);
@ -47,7 +47,7 @@ START_TEST(elm_layout_swallows)
fail_if(!efl_content_set(efl_part(ly, "element1"), bt)); fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
ck_assert_ptr_eq(efl_parent_get(bt), ly); ck_assert_ptr_eq(efl_parent_get(bt), ly);
bt2 = efl_add(ELM_BUTTON_CLASS, ly); bt2 = efl_add(EFL_UI_BUTTON_CLASS, ly);
fail_if(!efl_content_set(efl_part(ly, "element1"), bt2)); fail_if(!efl_content_set(efl_part(ly, "element1"), bt2));
ck_assert_ptr_eq(efl_parent_get(bt2), ly); ck_assert_ptr_eq(efl_parent_get(bt2), ly);
/* bt is deleted at this point. */ /* bt is deleted at this point. */