diff --git a/po/POTFILES.in b/po/POTFILES.in index 623be8466d..3185320c0f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -158,7 +158,7 @@ src/lib/elementary/elm_segment_control.c src/lib/elementary/elm_separator.c src/lib/elementary/efl_ui_slider.c src/lib/elementary/elm_slideshow.c -src/lib/elementary/efl_ui_spinner.c +src/lib/elementary/elm_spinner.c src/lib/elementary/elm_store.c src/lib/elementary/elm_sys_notify.c src/lib/elementary/elm_systray.c diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 982752b915..ad50ab466b 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -62,7 +62,7 @@ elm_public_eolian_files = \ lib/elementary/elm_route.eo \ lib/elementary/elm_scroller.eo \ lib/elementary/efl_ui_slider.eo \ - lib/elementary/efl_ui_spinner.eo \ + lib/elementary/elm_spinner.eo \ lib/elementary/elm_sys_notify_interface.eo \ lib/elementary/elm_sys_notify.eo \ lib/elementary/elm_sys_notify_dbus.eo \ @@ -282,7 +282,7 @@ includesunstable_HEADERS = \ lib/elementary/elm_widget_separator.h \ lib/elementary/efl_ui_slider_private.h \ lib/elementary/elm_widget_slideshow.h \ - lib/elementary/efl_ui_spinner_private.h \ + lib/elementary/elm_widget_spinner.h \ lib/elementary/elm_widget_table.h \ lib/elementary/elm_widget_thumb.h \ lib/elementary/elm_widget_toolbar.h \ @@ -505,7 +505,7 @@ includesub_HEADERS = \ lib/elementary/elm_slideshow_common.h \ lib/elementary/elm_slideshow_legacy.h \ lib/elementary/elm_spinner.h \ - lib/elementary/efl_ui_spinner_eo.h \ + lib/elementary/elm_spinner_eo.h \ lib/elementary/elm_spinner_legacy.h \ lib/elementary/elm_store.h \ lib/elementary/elm_systray.h \ @@ -649,7 +649,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_separator.c \ lib/elementary/efl_ui_slider.c \ lib/elementary/elm_slideshow.c \ - lib/elementary/efl_ui_spinner.c \ + lib/elementary/elm_spinner.c \ lib/elementary/elm_store.c \ lib/elementary/elm_systray.c \ lib/elementary/elm_systray_watcher.c \ diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index 8dbcac938f..455606dccc 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -150,7 +150,7 @@ _spinner_fill(Eo *obj) } elm_spinner_editable_set(obj, EINA_FALSE); elm_spinner_min_max_set(obj, 0, k - 1); - elm_spinner_wrap_set(obj, 1); + elm_obj_spinner_wrap_set(obj, 1); } static void @@ -348,14 +348,14 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_text_set(o, "Filter:"); efl_pack(box2, o); - o = spinner = efl_add(EFL_UI_SPINNER_CLASS, win, + o = spinner = efl_add(ELM_SPINNER_CLASS, win, efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0), efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5)); _spinner_fill(o); efl_pack(box2, o); spinner = o; - o = efl_add(EFL_UI_SPINNER_CLASS, win, + o = efl_add(ELM_SPINNER_CLASS, win, efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5), elm_spinner_min_max_set(efl_added, 6, 120), diff --git a/src/lib/elementary/efl_ui_spinner_eo.h b/src/lib/elementary/efl_ui_spinner_eo.h deleted file mode 100644 index d946a7e273..0000000000 --- a/src/lib/elementary/efl_ui_spinner_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "efl_ui_spinner.eo.h" diff --git a/src/lib/elementary/efl_ui_spinner.c b/src/lib/elementary/elm_spinner.c similarity index 87% rename from src/lib/elementary/efl_ui_spinner.c rename to src/lib/elementary/elm_spinner.c index 76128c86bf..d6f0591288 100644 --- a/src/lib/elementary/efl_ui_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -10,13 +10,13 @@ #include #include "elm_priv.h" -#include "efl_ui_spinner_private.h" +#include "elm_widget_spinner.h" #include "Eo.h" -#define MY_CLASS EFL_UI_SPINNER_CLASS +#define MY_CLASS ELM_SPINNER_CLASS -#define MY_CLASS_NAME "Efl.Ui.Spinner" +#define MY_CLASS_NAME "Elm_Spinner" #define MY_CLASS_NAME_LEGACY "elm_spinner" #define ELM_SPINNER_DELAY_CHANGE_TIME 0.2 @@ -75,13 +75,13 @@ _is_valid_digit(char x) return ((x >= '0' && x <= '9') || (x == '.')) ? EINA_TRUE : EINA_FALSE; } -static Efl_Ui_Spinner_Format_Type +static Elm_Spinner_Format_Type _is_label_format_integer(const char *fmt) { const char *itr = NULL; const char *start = NULL; Eina_Bool found = EINA_FALSE; - Efl_Ui_Spinner_Format_Type ret_type = SPINNER_FORMAT_INVALID; + Elm_Spinner_Format_Type ret_type = SPINNER_FORMAT_INVALID; start = strchr(fmt, '%'); if (!start) return SPINNER_FORMAT_INVALID; @@ -126,10 +126,10 @@ _is_label_format_integer(const char *fmt) } static void -_entry_show(Efl_Ui_Spinner_Data *sd) +_entry_show(Elm_Spinner_Data *sd) { Eina_List *l; - Efl_Ui_Spinner_Special_Value *sv; + Elm_Spinner_Special_Value *sv; char buf[32], fmt[32] = "%0.f"; EINA_LIST_FOREACH(sd->special_values, l, sv) @@ -190,9 +190,9 @@ _label_write(Evas_Object *obj) { Eina_List *l; char buf[1024]; - Efl_Ui_Spinner_Special_Value *sv; + Elm_Spinner_Special_Value *sv; - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); EINA_LIST_FOREACH(sd->special_values, l, sv) { @@ -226,7 +226,7 @@ apply: static Eina_Bool _delay_change_timer_cb(void *data) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); sd->delay_change_timer = NULL; efl_event_callback_legacy_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL); @@ -238,7 +238,7 @@ static Eina_Bool _value_set(Evas_Object *obj, double new_val) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); if (sd->round > 0) new_val = sd->val_base + @@ -281,7 +281,7 @@ _val_set(Evas_Object *obj) { double pos = 0.0; - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); if (sd->val_max > sd->val_min) @@ -304,7 +304,7 @@ _drag_cb(void *data, Evas_Object *obj = data; const char *style; - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); if (elm_widget_disabled_get(data)) return; @@ -346,7 +346,7 @@ _drag_start_cb(void *data, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); if (elm_widget_disabled_get(data)) return; sd->drag_prev_pos = 0; sd->drag_val_step = 1; @@ -361,7 +361,7 @@ _drag_stop_cb(void *data, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); if (elm_widget_disabled_get(data)) return; @@ -377,7 +377,7 @@ _drag_stop_cb(void *data, static void _entry_hide(Evas_Object *obj) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); if (sd->button_layout) { @@ -402,7 +402,7 @@ _entry_value_apply(Evas_Object *obj) double val; char *end; - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); if (!sd->entry_visible) return; @@ -504,7 +504,7 @@ invalid_input: static void _entry_accept_filter_add(Evas_Object *obj) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); static Elm_Entry_Filter_Accept_Set digits_filter_data; if (!sd->ent) return; @@ -549,7 +549,7 @@ _min_max_validity_filter(void *data, Evas_Object *obj, char **text) EINA_SAFETY_ON_NULL_RETURN(obj); EINA_SAFETY_ON_NULL_RETURN(text); - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); str = elm_object_text_get(obj); if (!str) return; @@ -591,7 +591,7 @@ _entry_show_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); _entry_show(sd); elm_object_focus_set(obj, EINA_TRUE); @@ -604,7 +604,7 @@ _entry_show_cb(void *data, static void _toggle_entry(Evas_Object *obj) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); if (sd->dragging) { @@ -666,7 +666,7 @@ _entry_toggle_cb(void *data EINA_UNUSED, static Eina_Bool _spin_value(void *data) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); double real_speed = sd->spin_speed; /* Sanity check: our step size should be at least as large as our rounding value */ @@ -689,7 +689,7 @@ _spin_value(void *data) static Eina_Bool _val_inc_dec_start(void *data) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); sd->interval = sd->first_interval; sd->spin_speed = sd->inc_btn_activated ? sd->step : -sd->step; @@ -706,7 +706,7 @@ _val_inc_dec_start(void *data) static void _spin_stop(Evas_Object *obj) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); sd->interval = sd->first_interval; sd->spin_speed = 0; @@ -718,7 +718,7 @@ _spin_stop(Evas_Object *obj) static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); if (sd->spin_timer) _spin_stop(obj); else if (sd->entry_visible) _entry_toggle_cb(NULL, obj, NULL, NULL); @@ -727,7 +727,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_efl_ui_spinner_elm_widget_widget_event(Eo *obj, Efl_Ui_Spinner_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) +_elm_spinner_elm_widget_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) { Eo *ev = eo_event->info; @@ -769,7 +769,7 @@ _button_inc_dec_start_cb(void *data, const char *emission, const char *source EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); sd->inc_btn_activated = !strcmp(emission, "elm,action,increment,start") ? EINA_TRUE : EINA_FALSE; @@ -802,7 +802,7 @@ _button_inc_dec_stop_cb(void *data, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); if (sd->longpress_timer) { @@ -822,7 +822,7 @@ _button_inc_dec_stop_cb(void *data, static void _inc_dec_button_clicked_cb(void *data, const Efl_Event *event) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); _spin_stop(data); sd->inc_btn_activated = sd->inc_button == event->object ? EINA_TRUE : EINA_FALSE; @@ -836,7 +836,7 @@ _inc_dec_button_clicked_cb(void *data, const Efl_Event *event) static void _inc_dec_button_pressed_cb(void *data, const Efl_Event *event) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); sd->inc_btn_activated = sd->inc_button == event->object ? EINA_TRUE : EINA_FALSE; @@ -852,7 +852,7 @@ _inc_dec_button_pressed_cb(void *data, const Efl_Event *event) static void _inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); if (sd->longpress_timer) { @@ -885,7 +885,7 @@ _entry_unfocused_cb(void *data, const Efl_Event *event EINA_UNUSED) static void _text_button_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); if (sd->entry_visible) return; _toggle_entry(data); @@ -895,7 +895,7 @@ static void _inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer *ev = event->info; - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); if (efl_input_processed_get(ev) && sd->longpress_timer) { @@ -905,7 +905,7 @@ _inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event) } EOLIAN static void -_efl_ui_spinner_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) +_elm_spinner_elm_layout_sizing_eval(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) { Evas_Coord minw = -1, minh = -1; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -919,7 +919,7 @@ _efl_ui_spinner_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UN } EOLIAN static Eina_Bool -_efl_ui_spinner_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Spinner_Data *sd, Elm_Object_Item *item EINA_UNUSED) +_elm_spinner_elm_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -953,7 +953,7 @@ _access_activate_cb(void *data, Eina_Strbuf *buf; Evas_Object *eo, *inc_btn; const char* increment_part; - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); if (!strncmp(elm_widget_style_get(data), "vertical", 8)) increment_part = "up_bt"; @@ -994,7 +994,7 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED) { const char *txt = NULL; Evas_Object *spinner = (Evas_Object *)(data); - EFL_UI_SPINNER_DATA_GET(spinner, sd); + ELM_SPINNER_DATA_GET(spinner, sd); if (sd->button_layout) { @@ -1027,7 +1027,7 @@ _access_activate_spinner_cb(void *data, Evas_Object *part_obj EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(data, sd); + ELM_SPINNER_DATA_GET(data, sd); if (elm_widget_disabled_get(data)) return; if (!sd->entry_visible) @@ -1040,7 +1040,7 @@ _access_increment_decrement_info_say(Evas_Object *obj, { Eina_Strbuf *buf; - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); buf = eina_strbuf_new(); if (is_incremented) @@ -1069,7 +1069,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access) Evas_Object *ao; Elm_Access_Info *ai; - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); if (sd->button_layout) { @@ -1160,10 +1160,10 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_efl_ui_spinner_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Spinner_Data *priv) +_elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -1245,9 +1245,9 @@ _efl_ui_spinner_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Spinner_Data *priv) } EOLIAN static void -_efl_ui_spinner_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Spinner_Data *sd) +_elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd) { - Efl_Ui_Spinner_Special_Value *sv; + Elm_Spinner_Special_Value *sv; eina_stringshare_del(sd->label); ecore_timer_del(sd->delay_change_timer); @@ -1267,7 +1267,7 @@ _efl_ui_spinner_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Spinner_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_spinner_elm_widget_theme_apply(Eo *obj, Efl_Ui_Spinner_Data *sd) +_elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); @@ -1318,33 +1318,33 @@ _efl_ui_spinner_elm_widget_theme_apply(Eo *obj, Efl_Ui_Spinner_Data *sd) return EFL_UI_THEME_APPLY_SUCCESS; } -static Eina_Bool _efl_ui_spinner_smart_focus_next_enable = EINA_FALSE; +static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE; EOLIAN static Eina_Bool -_efl_ui_spinner_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) +_elm_spinner_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Spinner_Data *_pd EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); - return _efl_ui_spinner_smart_focus_next_enable | sd->button_layout; + return _elm_spinner_smart_focus_next_enable | sd->button_layout; } EOLIAN static Eina_Bool -_efl_ui_spinner_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) +_elm_spinner_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Spinner_Data *_pd EINA_UNUSED) { - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_DATA_GET(obj, sd); if (sd->button_layout) return EINA_TRUE; return EINA_FALSE; } EOLIAN static Eina_Bool -_efl_ui_spinner_elm_widget_focus_direction(Eo *obj, Efl_Ui_Spinner_Data *_pd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) +_elm_spinner_elm_widget_focus_direction(Eo *obj, Elm_Spinner_Data *_pd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) { Eina_Bool ret; Eina_List *items = NULL; void *(*list_data_get)(const Eina_List *list); - EFL_UI_SPINNER_CHECK(obj) EINA_FALSE; + ELM_SPINNER_CHECK(obj) EINA_FALSE; if (!_pd) return EINA_FALSE; @@ -1376,13 +1376,13 @@ _access_object_get(const Evas_Object *obj, const char* part) } EOLIAN static Eina_Bool -_efl_ui_spinner_elm_widget_focus_next(Eo *obj, Efl_Ui_Spinner_Data *_pd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) +_elm_spinner_elm_widget_focus_next(Eo *obj, Elm_Spinner_Data *_pd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) { Evas_Object *ao; Eina_List *items = NULL; int ret; - EFL_UI_SPINNER_CHECK(obj) EINA_FALSE; + ELM_SPINNER_CHECK(obj) EINA_FALSE; if (_elm_config->access_mode) { @@ -1404,10 +1404,10 @@ _efl_ui_spinner_elm_widget_focus_next(Eo *obj, Efl_Ui_Spinner_Data *_pd, Elm_Foc } EOLIAN static void -_efl_ui_spinner_elm_widget_on_access_update(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UNUSED, Eina_Bool acs) +_elm_spinner_elm_widget_on_access_update(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED, Eina_Bool acs) { - _efl_ui_spinner_smart_focus_next_enable = acs; - _access_spinner_register(obj, _efl_ui_spinner_smart_focus_next_enable); + _elm_spinner_smart_focus_next_enable = acs; + _access_spinner_register(obj, _elm_spinner_smart_focus_next_enable); } EAPI Evas_Object * @@ -1466,7 +1466,7 @@ elm_spinner_value_get(const Evas_Object *obj) } EOLIAN static Eo * -_efl_ui_spinner_efl_object_constructor(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) +_elm_spinner_efl_object_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); @@ -1477,9 +1477,9 @@ _efl_ui_spinner_efl_object_constructor(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UN } EOLIAN static void -_efl_ui_spinner_label_format_set(Eo *obj, Efl_Ui_Spinner_Data *sd, const char *fmt) +_elm_spinner_label_format_set(Eo *obj, Elm_Spinner_Data *sd, const char *fmt) { - Efl_Ui_Spinner_Format_Type type; + Elm_Spinner_Format_Type type; if (!fmt) fmt = "%.0f"; type = _is_label_format_integer(fmt); @@ -1502,13 +1502,13 @@ _efl_ui_spinner_label_format_set(Eo *obj, Efl_Ui_Spinner_Data *sd, const char *f } EOLIAN static const char* -_efl_ui_spinner_label_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_label_format_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->label; } EOLIAN static void -_efl_ui_spinner_efl_ui_spin_min_max_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double min, double max) +_elm_spinner_efl_ui_spin_min_max_set(Eo *obj, Elm_Spinner_Data *sd, double min, double max) { if ((sd->val_min == min) && (sd->val_max == max)) return; @@ -1523,26 +1523,26 @@ _efl_ui_spinner_efl_ui_spin_min_max_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double } EOLIAN static void -_efl_ui_spinner_efl_ui_spin_min_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double *min, double *max) +_elm_spinner_efl_ui_spin_min_max_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; } EOLIAN static void -_efl_ui_spinner_efl_ui_spin_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double step) +_elm_spinner_efl_ui_spin_step_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double step) { sd->step = step; } EOLIAN static double -_efl_ui_spinner_efl_ui_spin_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_efl_ui_spin_step_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->step; } EOLIAN static void -_efl_ui_spinner_efl_ui_spin_value_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double val) +_elm_spinner_efl_ui_spin_value_set(Eo *obj, Elm_Spinner_Data *sd, double val) { if (sd->val == val) return; @@ -1565,27 +1565,27 @@ _efl_ui_spinner_efl_ui_spin_value_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double v } EOLIAN static double -_efl_ui_spinner_efl_ui_spin_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_efl_ui_spin_value_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->val; } EOLIAN static void -_efl_ui_spinner_wrap_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, Eina_Bool wrap) +_elm_spinner_wrap_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, Eina_Bool wrap) { sd->wrap = wrap; } EOLIAN static Eina_Bool -_efl_ui_spinner_wrap_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_wrap_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->wrap; } EOLIAN static void -_efl_ui_spinner_special_value_add(Eo *obj, Efl_Ui_Spinner_Data *sd, double value, const char *label) +_elm_spinner_special_value_add(Eo *obj, Elm_Spinner_Data *sd, double value, const char *label) { - Efl_Ui_Spinner_Special_Value *sv; + Elm_Spinner_Special_Value *sv; Eina_List *l; EINA_LIST_FOREACH(sd->special_values, l, sv) @@ -1611,11 +1611,11 @@ EAPI void elm_spinner_special_value_del(Evas_Object *obj, double value) { - Efl_Ui_Spinner_Special_Value *sv; + Elm_Spinner_Special_Value *sv; Eina_List *l; - EFL_UI_SPINNER_CHECK(obj); - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_CHECK(obj); + ELM_SPINNER_DATA_GET(obj, sd); EINA_LIST_FOREACH(sd->special_values, l, sv) { @@ -1634,11 +1634,11 @@ EAPI const char * elm_spinner_special_value_get(Evas_Object *obj, double value) { - Efl_Ui_Spinner_Special_Value *sv; + Elm_Spinner_Special_Value *sv; Eina_List *l; - EFL_UI_SPINNER_CHECK(obj) NULL; - EFL_UI_SPINNER_DATA_GET(obj, sd); + ELM_SPINNER_CHECK(obj) NULL; + ELM_SPINNER_DATA_GET(obj, sd); EINA_LIST_FOREACH(sd->special_values, l, sv) { @@ -1650,64 +1650,64 @@ elm_spinner_special_value_get(Evas_Object *obj, } EOLIAN static void -_efl_ui_spinner_editable_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, Eina_Bool editable) +_elm_spinner_editable_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, Eina_Bool editable) { sd->editable = editable; } EOLIAN static Eina_Bool -_efl_ui_spinner_editable_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_editable_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->editable; } EOLIAN static void -_efl_ui_spinner_efl_ui_spin_interval_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double interval) +_elm_spinner_efl_ui_spin_interval_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double interval) { sd->first_interval = interval; } EOLIAN static double -_efl_ui_spinner_efl_ui_spin_interval_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_efl_ui_spin_interval_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->first_interval; } EOLIAN static void -_efl_ui_spinner_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double base) +_elm_spinner_base_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double base) { sd->val_base = base; } EOLIAN static double -_efl_ui_spinner_base_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_base_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->val_base; } EOLIAN static void -_efl_ui_spinner_round_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, int rnd) +_elm_spinner_round_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, int rnd) { sd->round = rnd; } EOLIAN static int -_efl_ui_spinner_round_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_round_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->round; } EOLIAN static void -_efl_ui_spinner_class_constructor(Efl_Class *klass) +_elm_spinner_class_constructor(Efl_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); if (_elm_config->access_mode) - _efl_ui_spinner_smart_focus_next_enable = EINA_TRUE; + _elm_spinner_smart_focus_next_enable = EINA_TRUE; } EOLIAN static const Elm_Atspi_Action * -_efl_ui_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd EINA_UNUSED) +_elm_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd EINA_UNUSED) { static Elm_Atspi_Action atspi_actions[] = { { "toggle", "toggle", NULL, _key_action_toggle}, @@ -1719,14 +1719,14 @@ _efl_ui_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_U // A11Y Accessibility EOLIAN static void -_efl_ui_spinner_elm_interface_atspi_value_value_and_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double *value, const char **text) +_elm_spinner_elm_interface_atspi_value_value_and_text_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *value, const char **text) { if (value) *value = sd->val; if (text) *text = NULL; } EOLIAN static Eina_Bool -_efl_ui_spinner_elm_interface_atspi_value_value_and_text_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double value, const char *text EINA_UNUSED) +_elm_spinner_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Spinner_Data *sd, double value, const char *text EINA_UNUSED) { if (sd->val_min > value) return EINA_FALSE; if (sd->val_max < value) return EINA_FALSE; @@ -1738,7 +1738,7 @@ _efl_ui_spinner_elm_interface_atspi_value_value_and_text_set(Eo *obj, Efl_Ui_Spi } EOLIAN static void -_efl_ui_spinner_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double *lower, double *upper, const char **descr) +_elm_spinner_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *lower, double *upper, const char **descr) { if (lower) *lower = sd->val_min; if (upper) *upper = sd->val_max; @@ -1746,16 +1746,16 @@ _efl_ui_spinner_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Efl_Ui_ } EOLIAN static double -_efl_ui_spinner_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) +_elm_spinner_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->step; } EOLIAN static const char* -_efl_ui_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Spinner_Data *sd EINA_UNUSED) +_elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED) { const char *name; - name = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_SPINNER_CLASS)); + name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_SPINNER_CLASS)); if (name) return name; const char *ret = elm_layout_text_get(obj, "elm.text"); return ret; @@ -1765,8 +1765,8 @@ _efl_ui_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Spinner_ /* Internal EO APIs and hidden overrides */ -#define EFL_UI_SPINNER_EXTRA_OPS \ - ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_spinner), \ - EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_spinner) +#define ELM_SPINNER_EXTRA_OPS \ + ELM_LAYOUT_SIZING_EVAL_OPS(elm_spinner), \ + EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_spinner) -#include "efl_ui_spinner.eo.c" +#include "elm_spinner.eo.c" diff --git a/src/lib/elementary/efl_ui_spinner.eo b/src/lib/elementary/elm_spinner.eo similarity index 97% rename from src/lib/elementary/efl_ui_spinner.eo rename to src/lib/elementary/elm_spinner.eo index 18ce844ff1..f9454bdbae 100644 --- a/src/lib/elementary/efl_ui_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -1,8 +1,9 @@ -class Efl.Ui.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, - Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action) +class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, + Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action) { [[Elementary spinner class]] legacy_prefix: elm_spinner; + eo_prefix: elm_obj_spinner; event_prefix: elm_spinner; methods { @property wrap { diff --git a/src/lib/elementary/elm_spinner.h b/src/lib/elementary/elm_spinner.h index fdcbdd09d8..6da9976379 100644 --- a/src/lib/elementary/elm_spinner.h +++ b/src/lib/elementary/elm_spinner.h @@ -58,7 +58,7 @@ */ #ifdef EFL_EO_API_SUPPORT -#include "efl_ui_spinner_eo.h" +#include "elm_spinner_eo.h" #endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_spinner_legacy.h" diff --git a/src/lib/elementary/elm_spinner_eo.h b/src/lib/elementary/elm_spinner_eo.h new file mode 100644 index 0000000000..8c6d57dfd5 --- /dev/null +++ b/src/lib/elementary/elm_spinner_eo.h @@ -0,0 +1 @@ +#include "elm_spinner.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_spinner_legacy.h b/src/lib/elementary/elm_spinner_legacy.h index 680a58263b..a09c19d14a 100644 --- a/src/lib/elementary/elm_spinner_legacy.h +++ b/src/lib/elementary/elm_spinner_legacy.h @@ -194,4 +194,4 @@ EAPI void elm_spinner_value_set(Evas_Object *obj, double val); */ EAPI double elm_spinner_value_get(const Evas_Object *obj); -#include "efl_ui_spinner.eo.legacy.h" +#include "elm_spinner.eo.legacy.h" diff --git a/src/lib/elementary/efl_ui_spinner_private.h b/src/lib/elementary/elm_widget_spinner.h similarity index 77% rename from src/lib/elementary/efl_ui_spinner_private.h rename to src/lib/elementary/elm_widget_spinner.h index 0cb1aa550f..82143c6d42 100644 --- a/src/lib/elementary/efl_ui_spinner_private.h +++ b/src/lib/elementary/elm_widget_spinner.h @@ -26,15 +26,15 @@ * Base layout smart data extended with spinner instance data. */ -typedef enum _Efl_Ui_Spinner_Format_Type +typedef enum _Elm_Spinner_Format_Type { SPINNER_FORMAT_FLOAT, SPINNER_FORMAT_INT, SPINNER_FORMAT_INVALID -} Efl_Ui_Spinner_Format_Type; +} Elm_Spinner_Format_Type; -typedef struct _Efl_Ui_Spinner_Data Efl_Ui_Spinner_Data; -struct _Efl_Ui_Spinner_Data +typedef struct _Elm_Spinner_Data Elm_Spinner_Data; +struct _Elm_Spinner_Data { Evas_Object *ent, *inc_button, *dec_button, *text_button; const char *label; @@ -49,7 +49,7 @@ struct _Efl_Ui_Spinner_Data Ecore_Timer *longpress_timer; /**< a timer to detect long press. After lonpress timeout, start continuous change of values until mouse up */ Eina_List *special_values; - Efl_Ui_Spinner_Format_Type format_type; + Elm_Spinner_Format_Type format_type; Eina_Bool entry_visible : 1; Eina_Bool entry_reactivate : 1; @@ -61,8 +61,8 @@ struct _Efl_Ui_Spinner_Data Eina_Bool inc_btn_activated : 1; }; -typedef struct _Efl_Ui_Spinner_Special_Value Efl_Ui_Spinner_Special_Value; -struct _Efl_Ui_Spinner_Special_Value +typedef struct _Elm_Spinner_Special_Value Elm_Spinner_Special_Value; +struct _Elm_Spinner_Special_Value { double value; const char *label; @@ -72,11 +72,11 @@ struct _Efl_Ui_Spinner_Special_Value * @} */ -#define EFL_UI_SPINNER_DATA_GET(o, sd) \ -Efl_Ui_Spinner_Data * sd = efl_data_scope_get(o, EFL_UI_SPINNER_CLASS) +#define ELM_SPINNER_DATA_GET(o, sd) \ + Elm_Spinner_Data * sd = efl_data_scope_get(o, ELM_SPINNER_CLASS) -#define EFL_UI_SPINNER_DATA_GET_OR_RETURN(o, ptr) \ - EFL_UI_SPINNER_DATA_GET(o, ptr); \ +#define ELM_SPINNER_DATA_GET_OR_RETURN(o, ptr) \ + ELM_SPINNER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ @@ -84,8 +84,8 @@ Efl_Ui_Spinner_Data * sd = efl_data_scope_get(o, EFL_UI_SPINNER_CLASS) return; \ } -#define EFL_UI_SPINNER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - EFL_UI_SPINNER_DATA_GET(o, ptr); \ +#define ELM_SPINNER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_SPINNER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ @@ -93,8 +93,8 @@ Efl_Ui_Spinner_Data * sd = efl_data_scope_get(o, EFL_UI_SPINNER_CLASS) return val; \ } -#define EFL_UI_SPINNER_CHECK(obj) \ - if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_SPINNER_CLASS))) \ +#define ELM_SPINNER_CHECK(obj) \ + if (EINA_UNLIKELY(!efl_isa((obj), ELM_SPINNER_CLASS))) \ return #endif