summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am8
-rw-r--r--src/bin/elementary/test_gfx_filters.c6
-rw-r--r--src/lib/elementary/efl_ui_spinner_eo.h1
-rw-r--r--src/lib/elementary/elm_spinner.c (renamed from src/lib/elementary/efl_ui_spinner.c)198
-rw-r--r--src/lib/elementary/elm_spinner.eo (renamed from src/lib/elementary/efl_ui_spinner.eo)5
-rw-r--r--src/lib/elementary/elm_spinner.h2
-rw-r--r--src/lib/elementary/elm_spinner_eo.h1
-rw-r--r--src/lib/elementary/elm_spinner_legacy.h2
-rw-r--r--src/lib/elementary/elm_widget_spinner.h (renamed from src/lib/elementary/efl_ui_spinner_private.h)30
10 files changed, 128 insertions, 127 deletions
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
158src/lib/elementary/elm_separator.c 158src/lib/elementary/elm_separator.c
159src/lib/elementary/efl_ui_slider.c 159src/lib/elementary/efl_ui_slider.c
160src/lib/elementary/elm_slideshow.c 160src/lib/elementary/elm_slideshow.c
161src/lib/elementary/efl_ui_spinner.c 161src/lib/elementary/elm_spinner.c
162src/lib/elementary/elm_store.c 162src/lib/elementary/elm_store.c
163src/lib/elementary/elm_sys_notify.c 163src/lib/elementary/elm_sys_notify.c
164src/lib/elementary/elm_systray.c 164src/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 = \
62 lib/elementary/elm_route.eo \ 62 lib/elementary/elm_route.eo \
63 lib/elementary/elm_scroller.eo \ 63 lib/elementary/elm_scroller.eo \
64 lib/elementary/efl_ui_slider.eo \ 64 lib/elementary/efl_ui_slider.eo \
65 lib/elementary/efl_ui_spinner.eo \ 65 lib/elementary/elm_spinner.eo \
66 lib/elementary/elm_sys_notify_interface.eo \ 66 lib/elementary/elm_sys_notify_interface.eo \
67 lib/elementary/elm_sys_notify.eo \ 67 lib/elementary/elm_sys_notify.eo \
68 lib/elementary/elm_sys_notify_dbus.eo \ 68 lib/elementary/elm_sys_notify_dbus.eo \
@@ -282,7 +282,7 @@ includesunstable_HEADERS = \
282 lib/elementary/elm_widget_separator.h \ 282 lib/elementary/elm_widget_separator.h \
283 lib/elementary/efl_ui_slider_private.h \ 283 lib/elementary/efl_ui_slider_private.h \
284 lib/elementary/elm_widget_slideshow.h \ 284 lib/elementary/elm_widget_slideshow.h \
285 lib/elementary/efl_ui_spinner_private.h \ 285 lib/elementary/elm_widget_spinner.h \
286 lib/elementary/elm_widget_table.h \ 286 lib/elementary/elm_widget_table.h \
287 lib/elementary/elm_widget_thumb.h \ 287 lib/elementary/elm_widget_thumb.h \
288 lib/elementary/elm_widget_toolbar.h \ 288 lib/elementary/elm_widget_toolbar.h \
@@ -505,7 +505,7 @@ includesub_HEADERS = \
505 lib/elementary/elm_slideshow_common.h \ 505 lib/elementary/elm_slideshow_common.h \
506 lib/elementary/elm_slideshow_legacy.h \ 506 lib/elementary/elm_slideshow_legacy.h \
507 lib/elementary/elm_spinner.h \ 507 lib/elementary/elm_spinner.h \
508 lib/elementary/efl_ui_spinner_eo.h \ 508 lib/elementary/elm_spinner_eo.h \
509 lib/elementary/elm_spinner_legacy.h \ 509 lib/elementary/elm_spinner_legacy.h \
510 lib/elementary/elm_store.h \ 510 lib/elementary/elm_store.h \
511 lib/elementary/elm_systray.h \ 511 lib/elementary/elm_systray.h \
@@ -649,7 +649,7 @@ lib_elementary_libelementary_la_SOURCES = \
649 lib/elementary/elm_separator.c \ 649 lib/elementary/elm_separator.c \
650 lib/elementary/efl_ui_slider.c \ 650 lib/elementary/efl_ui_slider.c \
651 lib/elementary/elm_slideshow.c \ 651 lib/elementary/elm_slideshow.c \
652 lib/elementary/efl_ui_spinner.c \ 652 lib/elementary/elm_spinner.c \
653 lib/elementary/elm_store.c \ 653 lib/elementary/elm_store.c \
654 lib/elementary/elm_systray.c \ 654 lib/elementary/elm_systray.c \
655 lib/elementary/elm_systray_watcher.c \ 655 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)
150 } 150 }
151 elm_spinner_editable_set(obj, EINA_FALSE); 151 elm_spinner_editable_set(obj, EINA_FALSE);
152 elm_spinner_min_max_set(obj, 0, k - 1); 152 elm_spinner_min_max_set(obj, 0, k - 1);
153 elm_spinner_wrap_set(obj, 1); 153 elm_obj_spinner_wrap_set(obj, 1);
154} 154}
155 155
156static void 156static void
@@ -348,14 +348,14 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
348 efl_text_set(o, "Filter:"); 348 efl_text_set(o, "Filter:");
349 efl_pack(box2, o); 349 efl_pack(box2, o);
350 350
351 o = spinner = efl_add(EFL_UI_SPINNER_CLASS, win, 351 o = spinner = efl_add(ELM_SPINNER_CLASS, win,
352 efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0), 352 efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
353 efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5)); 353 efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5));
354 _spinner_fill(o); 354 _spinner_fill(o);
355 efl_pack(box2, o); 355 efl_pack(box2, o);
356 spinner = o; 356 spinner = o;
357 357
358 o = efl_add(EFL_UI_SPINNER_CLASS, win, 358 o = efl_add(ELM_SPINNER_CLASS, win,
359 efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), 359 efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0),
360 efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5), 360 efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5),
361 elm_spinner_min_max_set(efl_added, 6, 120), 361 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 @@
1#include "efl_ui_spinner.eo.h"
diff --git a/src/lib/elementary/efl_ui_spinner.c b/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 @@
10#include <ctype.h> 10#include <ctype.h>
11 11
12#include "elm_priv.h" 12#include "elm_priv.h"
13#include "efl_ui_spinner_private.h" 13#include "elm_widget_spinner.h"
14 14
15#include "Eo.h" 15#include "Eo.h"
16 16
17#define MY_CLASS EFL_UI_SPINNER_CLASS 17#define MY_CLASS ELM_SPINNER_CLASS
18 18
19#define MY_CLASS_NAME "Efl.Ui.Spinner" 19#define MY_CLASS_NAME "Elm_Spinner"
20#define MY_CLASS_NAME_LEGACY "elm_spinner" 20#define MY_CLASS_NAME_LEGACY "elm_spinner"
21 21
22#define ELM_SPINNER_DELAY_CHANGE_TIME 0.2 22#define ELM_SPINNER_DELAY_CHANGE_TIME 0.2
@@ -75,13 +75,13 @@ _is_valid_digit(char x)
75 return ((x >= '0' && x <= '9') || (x == '.')) ? EINA_TRUE : EINA_FALSE; 75 return ((x >= '0' && x <= '9') || (x == '.')) ? EINA_TRUE : EINA_FALSE;
76} 76}
77 77
78static Efl_Ui_Spinner_Format_Type 78static Elm_Spinner_Format_Type
79_is_label_format_integer(const char *fmt) 79_is_label_format_integer(const char *fmt)
80{ 80{
81 const char *itr = NULL; 81 const char *itr = NULL;
82 const char *start = NULL; 82 const char *start = NULL;
83 Eina_Bool found = EINA_FALSE; 83 Eina_Bool found = EINA_FALSE;
84 Efl_Ui_Spinner_Format_Type ret_type = SPINNER_FORMAT_INVALID; 84 Elm_Spinner_Format_Type ret_type = SPINNER_FORMAT_INVALID;
85 85
86 start = strchr(fmt, '%'); 86 start = strchr(fmt, '%');
87 if (!start) return SPINNER_FORMAT_INVALID; 87 if (!start) return SPINNER_FORMAT_INVALID;
@@ -126,10 +126,10 @@ _is_label_format_integer(const char *fmt)
126} 126}
127 127
128static void 128static void
129_entry_show(Efl_Ui_Spinner_Data *sd) 129_entry_show(Elm_Spinner_Data *sd)
130{ 130{
131 Eina_List *l; 131 Eina_List *l;
132 Efl_Ui_Spinner_Special_Value *sv; 132 Elm_Spinner_Special_Value *sv;
133 char buf[32], fmt[32] = "%0.f"; 133 char buf[32], fmt[32] = "%0.f";
134 134
135 EINA_LIST_FOREACH(sd->special_values, l, sv) 135 EINA_LIST_FOREACH(sd->special_values, l, sv)
@@ -190,9 +190,9 @@ _label_write(Evas_Object *obj)
190{ 190{
191 Eina_List *l; 191 Eina_List *l;
192 char buf[1024]; 192 char buf[1024];
193 Efl_Ui_Spinner_Special_Value *sv; 193 Elm_Spinner_Special_Value *sv;
194 194
195 EFL_UI_SPINNER_DATA_GET(obj, sd); 195 ELM_SPINNER_DATA_GET(obj, sd);
196 196
197 EINA_LIST_FOREACH(sd->special_values, l, sv) 197 EINA_LIST_FOREACH(sd->special_values, l, sv)
198 { 198 {
@@ -226,7 +226,7 @@ apply:
226static Eina_Bool 226static Eina_Bool
227_delay_change_timer_cb(void *data) 227_delay_change_timer_cb(void *data)
228{ 228{
229 EFL_UI_SPINNER_DATA_GET(data, sd); 229 ELM_SPINNER_DATA_GET(data, sd);
230 230
231 sd->delay_change_timer = NULL; 231 sd->delay_change_timer = NULL;
232 efl_event_callback_legacy_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL); 232 efl_event_callback_legacy_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL);
@@ -238,7 +238,7 @@ static Eina_Bool
238_value_set(Evas_Object *obj, 238_value_set(Evas_Object *obj,
239 double new_val) 239 double new_val)
240{ 240{
241 EFL_UI_SPINNER_DATA_GET(obj, sd); 241 ELM_SPINNER_DATA_GET(obj, sd);
242 242
243 if (sd->round > 0) 243 if (sd->round > 0)
244 new_val = sd->val_base + 244 new_val = sd->val_base +
@@ -281,7 +281,7 @@ _val_set(Evas_Object *obj)
281{ 281{
282 double pos = 0.0; 282 double pos = 0.0;
283 283
284 EFL_UI_SPINNER_DATA_GET(obj, sd); 284 ELM_SPINNER_DATA_GET(obj, sd);
285 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 285 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
286 286
287 if (sd->val_max > sd->val_min) 287 if (sd->val_max > sd->val_min)
@@ -304,7 +304,7 @@ _drag_cb(void *data,
304 Evas_Object *obj = data; 304 Evas_Object *obj = data;
305 const char *style; 305 const char *style;
306 306
307 EFL_UI_SPINNER_DATA_GET(obj, sd); 307 ELM_SPINNER_DATA_GET(obj, sd);
308 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 308 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
309 309
310 if (elm_widget_disabled_get(data)) return; 310 if (elm_widget_disabled_get(data)) return;
@@ -346,7 +346,7 @@ _drag_start_cb(void *data,
346 const char *emission EINA_UNUSED, 346 const char *emission EINA_UNUSED,
347 const char *source EINA_UNUSED) 347 const char *source EINA_UNUSED)
348{ 348{
349 EFL_UI_SPINNER_DATA_GET(data, sd); 349 ELM_SPINNER_DATA_GET(data, sd);
350 if (elm_widget_disabled_get(data)) return; 350 if (elm_widget_disabled_get(data)) return;
351 sd->drag_prev_pos = 0; 351 sd->drag_prev_pos = 0;
352 sd->drag_val_step = 1; 352 sd->drag_val_step = 1;
@@ -361,7 +361,7 @@ _drag_stop_cb(void *data,
361 const char *emission EINA_UNUSED, 361 const char *emission EINA_UNUSED,
362 const char *source EINA_UNUSED) 362 const char *source EINA_UNUSED)
363{ 363{
364 EFL_UI_SPINNER_DATA_GET(data, sd); 364 ELM_SPINNER_DATA_GET(data, sd);
365 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 365 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
366 if (elm_widget_disabled_get(data)) return; 366 if (elm_widget_disabled_get(data)) return;
367 367
@@ -377,7 +377,7 @@ _drag_stop_cb(void *data,
377static void 377static void
378_entry_hide(Evas_Object *obj) 378_entry_hide(Evas_Object *obj)
379{ 379{
380 EFL_UI_SPINNER_DATA_GET(obj, sd); 380 ELM_SPINNER_DATA_GET(obj, sd);
381 381
382 if (sd->button_layout) 382 if (sd->button_layout)
383 { 383 {
@@ -402,7 +402,7 @@ _entry_value_apply(Evas_Object *obj)
402 double val; 402 double val;
403 char *end; 403 char *end;
404 404
405 EFL_UI_SPINNER_DATA_GET(obj, sd); 405 ELM_SPINNER_DATA_GET(obj, sd);
406 406
407 if (!sd->entry_visible) return; 407 if (!sd->entry_visible) return;
408 408
@@ -504,7 +504,7 @@ invalid_input:
504static void 504static void
505_entry_accept_filter_add(Evas_Object *obj) 505_entry_accept_filter_add(Evas_Object *obj)
506{ 506{
507 EFL_UI_SPINNER_DATA_GET(obj, sd); 507 ELM_SPINNER_DATA_GET(obj, sd);
508 static Elm_Entry_Filter_Accept_Set digits_filter_data; 508 static Elm_Entry_Filter_Accept_Set digits_filter_data;
509 509
510 if (!sd->ent) return; 510 if (!sd->ent) return;
@@ -549,7 +549,7 @@ _min_max_validity_filter(void *data, Evas_Object *obj, char **text)
549 EINA_SAFETY_ON_NULL_RETURN(obj); 549 EINA_SAFETY_ON_NULL_RETURN(obj);
550 EINA_SAFETY_ON_NULL_RETURN(text); 550 EINA_SAFETY_ON_NULL_RETURN(text);
551 551
552 EFL_UI_SPINNER_DATA_GET(data, sd); 552 ELM_SPINNER_DATA_GET(data, sd);
553 553
554 str = elm_object_text_get(obj); 554 str = elm_object_text_get(obj);
555 if (!str) return; 555 if (!str) return;
@@ -591,7 +591,7 @@ _entry_show_cb(void *data,
591 Evas_Object *obj, 591 Evas_Object *obj,
592 void *event_info EINA_UNUSED) 592 void *event_info EINA_UNUSED)
593{ 593{
594 EFL_UI_SPINNER_DATA_GET(data, sd); 594 ELM_SPINNER_DATA_GET(data, sd);
595 595
596 _entry_show(sd); 596 _entry_show(sd);
597 elm_object_focus_set(obj, EINA_TRUE); 597 elm_object_focus_set(obj, EINA_TRUE);
@@ -604,7 +604,7 @@ _entry_show_cb(void *data,
604static void 604static void
605_toggle_entry(Evas_Object *obj) 605_toggle_entry(Evas_Object *obj)
606{ 606{
607 EFL_UI_SPINNER_DATA_GET(obj, sd); 607 ELM_SPINNER_DATA_GET(obj, sd);
608 608
609 if (sd->dragging) 609 if (sd->dragging)
610 { 610 {
@@ -666,7 +666,7 @@ _entry_toggle_cb(void *data EINA_UNUSED,
666static Eina_Bool 666static Eina_Bool
667_spin_value(void *data) 667_spin_value(void *data)
668{ 668{
669 EFL_UI_SPINNER_DATA_GET(data, sd); 669 ELM_SPINNER_DATA_GET(data, sd);
670 double real_speed = sd->spin_speed; 670 double real_speed = sd->spin_speed;
671 671
672 /* Sanity check: our step size should be at least as large as our rounding value */ 672 /* Sanity check: our step size should be at least as large as our rounding value */
@@ -689,7 +689,7 @@ _spin_value(void *data)
689static Eina_Bool 689static Eina_Bool
690_val_inc_dec_start(void *data) 690_val_inc_dec_start(void *data)
691{ 691{
692 EFL_UI_SPINNER_DATA_GET(data, sd); 692 ELM_SPINNER_DATA_GET(data, sd);
693 693
694 sd->interval = sd->first_interval; 694 sd->interval = sd->first_interval;
695 sd->spin_speed = sd->inc_btn_activated ? sd->step : -sd->step; 695 sd->spin_speed = sd->inc_btn_activated ? sd->step : -sd->step;
@@ -706,7 +706,7 @@ _val_inc_dec_start(void *data)
706static void 706static void
707_spin_stop(Evas_Object *obj) 707_spin_stop(Evas_Object *obj)
708{ 708{
709 EFL_UI_SPINNER_DATA_GET(obj, sd); 709 ELM_SPINNER_DATA_GET(obj, sd);
710 710
711 sd->interval = sd->first_interval; 711 sd->interval = sd->first_interval;
712 sd->spin_speed = 0; 712 sd->spin_speed = 0;
@@ -718,7 +718,7 @@ _spin_stop(Evas_Object *obj)
718static Eina_Bool 718static Eina_Bool
719_key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) 719_key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
720{ 720{
721 EFL_UI_SPINNER_DATA_GET(obj, sd); 721 ELM_SPINNER_DATA_GET(obj, sd);
722 722
723 if (sd->spin_timer) _spin_stop(obj); 723 if (sd->spin_timer) _spin_stop(obj);
724 else if (sd->entry_visible) _entry_toggle_cb(NULL, obj, NULL, NULL); 724 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)
727} 727}
728 728
729EOLIAN static Eina_Bool 729EOLIAN static Eina_Bool
730_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) 730_elm_spinner_elm_widget_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED)
731{ 731{
732 Eo *ev = eo_event->info; 732 Eo *ev = eo_event->info;
733 733
@@ -769,7 +769,7 @@ _button_inc_dec_start_cb(void *data,
769 const char *emission, 769 const char *emission,
770 const char *source EINA_UNUSED) 770 const char *source EINA_UNUSED)
771{ 771{
772 EFL_UI_SPINNER_DATA_GET(data, sd); 772 ELM_SPINNER_DATA_GET(data, sd);
773 773
774 sd->inc_btn_activated = 774 sd->inc_btn_activated =
775 !strcmp(emission, "elm,action,increment,start") ? EINA_TRUE : EINA_FALSE; 775 !strcmp(emission, "elm,action,increment,start") ? EINA_TRUE : EINA_FALSE;
@@ -802,7 +802,7 @@ _button_inc_dec_stop_cb(void *data,
802 const char *emission EINA_UNUSED, 802 const char *emission EINA_UNUSED,
803 const char *source EINA_UNUSED) 803 const char *source EINA_UNUSED)
804{ 804{
805 EFL_UI_SPINNER_DATA_GET(data, sd); 805 ELM_SPINNER_DATA_GET(data, sd);
806 806
807 if (sd->longpress_timer) 807 if (sd->longpress_timer)
808 { 808 {
@@ -822,7 +822,7 @@ _button_inc_dec_stop_cb(void *data,
822static void 822static void
823_inc_dec_button_clicked_cb(void *data, const Efl_Event *event) 823_inc_dec_button_clicked_cb(void *data, const Efl_Event *event)
824{ 824{
825 EFL_UI_SPINNER_DATA_GET(data, sd); 825 ELM_SPINNER_DATA_GET(data, sd);
826 826
827 _spin_stop(data); 827 _spin_stop(data);
828 sd->inc_btn_activated = sd->inc_button == event->object ? EINA_TRUE : EINA_FALSE; 828 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)
836static void 836static void
837_inc_dec_button_pressed_cb(void *data, const Efl_Event *event) 837_inc_dec_button_pressed_cb(void *data, const Efl_Event *event)
838{ 838{
839 EFL_UI_SPINNER_DATA_GET(data, sd); 839 ELM_SPINNER_DATA_GET(data, sd);
840 840
841 sd->inc_btn_activated = sd->inc_button == event->object ? EINA_TRUE : EINA_FALSE; 841 sd->inc_btn_activated = sd->inc_button == event->object ? EINA_TRUE : EINA_FALSE;
842 842
@@ -852,7 +852,7 @@ _inc_dec_button_pressed_cb(void *data, const Efl_Event *event)
852static void 852static void
853_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED) 853_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED)
854{ 854{
855 EFL_UI_SPINNER_DATA_GET(data, sd); 855 ELM_SPINNER_DATA_GET(data, sd);
856 856
857 if (sd->longpress_timer) 857 if (sd->longpress_timer)
858 { 858 {
@@ -885,7 +885,7 @@ _entry_unfocused_cb(void *data, const Efl_Event *event EINA_UNUSED)
885static void 885static void
886_text_button_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) 886_text_button_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
887{ 887{
888 EFL_UI_SPINNER_DATA_GET(data, sd); 888 ELM_SPINNER_DATA_GET(data, sd);
889 889
890 if (sd->entry_visible) return; 890 if (sd->entry_visible) return;
891 _toggle_entry(data); 891 _toggle_entry(data);
@@ -895,7 +895,7 @@ static void
895_inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event) 895_inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event)
896{ 896{
897 Efl_Input_Pointer *ev = event->info; 897 Efl_Input_Pointer *ev = event->info;
898 EFL_UI_SPINNER_DATA_GET(data, sd); 898 ELM_SPINNER_DATA_GET(data, sd);
899 899
900 if (efl_input_processed_get(ev) && sd->longpress_timer) 900 if (efl_input_processed_get(ev) && sd->longpress_timer)
901 { 901 {
@@ -905,7 +905,7 @@ _inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event)
905} 905}
906 906
907EOLIAN static void 907EOLIAN static void
908_efl_ui_spinner_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) 908_elm_spinner_elm_layout_sizing_eval(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
909{ 909{
910 Evas_Coord minw = -1, minh = -1; 910 Evas_Coord minw = -1, minh = -1;
911 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 911 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
919} 919}
920 920
921EOLIAN static Eina_Bool 921EOLIAN static Eina_Bool
922_efl_ui_spinner_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Spinner_Data *sd, Elm_Object_Item *item EINA_UNUSED) 922_elm_spinner_elm_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd, Elm_Object_Item *item EINA_UNUSED)
923{ 923{
924 Eina_Bool int_ret = EINA_FALSE; 924 Eina_Bool int_ret = EINA_FALSE;
925 925
@@ -953,7 +953,7 @@ _access_activate_cb(void *data,
953 Eina_Strbuf *buf; 953 Eina_Strbuf *buf;
954 Evas_Object *eo, *inc_btn; 954 Evas_Object *eo, *inc_btn;
955 const char* increment_part; 955 const char* increment_part;
956 EFL_UI_SPINNER_DATA_GET(data, sd); 956 ELM_SPINNER_DATA_GET(data, sd);
957 957
958 if (!strncmp(elm_widget_style_get(data), "vertical", 8)) 958 if (!strncmp(elm_widget_style_get(data), "vertical", 8))
959 increment_part = "up_bt"; 959 increment_part = "up_bt";
@@ -994,7 +994,7 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
994{ 994{
995 const char *txt = NULL; 995 const char *txt = NULL;
996 Evas_Object *spinner = (Evas_Object *)(data); 996 Evas_Object *spinner = (Evas_Object *)(data);
997 EFL_UI_SPINNER_DATA_GET(spinner, sd); 997 ELM_SPINNER_DATA_GET(spinner, sd);
998 998
999 if (sd->button_layout) 999 if (sd->button_layout)
1000 { 1000 {
@@ -1027,7 +1027,7 @@ _access_activate_spinner_cb(void *data,
1027 Evas_Object *part_obj EINA_UNUSED, 1027 Evas_Object *part_obj EINA_UNUSED,
1028 Elm_Object_Item *item EINA_UNUSED) 1028 Elm_Object_Item *item EINA_UNUSED)
1029{ 1029{
1030 EFL_UI_SPINNER_DATA_GET(data, sd); 1030 ELM_SPINNER_DATA_GET(data, sd);
1031 1031
1032 if (elm_widget_disabled_get(data)) return; 1032 if (elm_widget_disabled_get(data)) return;
1033 if (!sd->entry_visible) 1033 if (!sd->entry_visible)
@@ -1040,7 +1040,7 @@ _access_increment_decrement_info_say(Evas_Object *obj,
1040{ 1040{
1041 Eina_Strbuf *buf; 1041 Eina_Strbuf *buf;
1042 1042
1043 EFL_UI_SPINNER_DATA_GET(obj, sd); 1043 ELM_SPINNER_DATA_GET(obj, sd);
1044 1044
1045 buf = eina_strbuf_new(); 1045 buf = eina_strbuf_new();
1046 if (is_incremented) 1046 if (is_incremented)
@@ -1069,7 +1069,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
1069 Evas_Object *ao; 1069 Evas_Object *ao;
1070 Elm_Access_Info *ai; 1070 Elm_Access_Info *ai;
1071 1071
1072 EFL_UI_SPINNER_DATA_GET(obj, sd); 1072 ELM_SPINNER_DATA_GET(obj, sd);
1073 1073
1074 if (sd->button_layout) 1074 if (sd->button_layout)
1075 { 1075 {
@@ -1160,10 +1160,10 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
1160} 1160}
1161 1161
1162EOLIAN static void 1162EOLIAN static void
1163_efl_ui_spinner_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Spinner_Data *priv) 1163_elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
1164{ 1164{
1165 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1165 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1166 EFL_UI_SPINNER_DATA_GET(obj, sd); 1166 ELM_SPINNER_DATA_GET(obj, sd);
1167 1167
1168 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1168 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1169 elm_widget_sub_object_parent_add(obj); 1169 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)
1245} 1245}
1246 1246
1247EOLIAN static void 1247EOLIAN static void
1248_efl_ui_spinner_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Spinner_Data *sd) 1248_elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd)
1249{ 1249{
1250 Efl_Ui_Spinner_Special_Value *sv; 1250 Elm_Spinner_Special_Value *sv;
1251 1251
1252 eina_stringshare_del(sd->label); 1252 eina_stringshare_del(sd->label);
1253 ecore_timer_del(sd->delay_change_timer); 1253 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)
1267} 1267}
1268 1268
1269EOLIAN static Efl_Ui_Theme_Apply 1269EOLIAN static Efl_Ui_Theme_Apply
1270_efl_ui_spinner_elm_widget_theme_apply(Eo *obj, Efl_Ui_Spinner_Data *sd) 1270_elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd)
1271{ 1271{
1272 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 1272 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
1273 1273
@@ -1318,33 +1318,33 @@ _efl_ui_spinner_elm_widget_theme_apply(Eo *obj, Efl_Ui_Spinner_Data *sd)
1318 return EFL_UI_THEME_APPLY_SUCCESS; 1318 return EFL_UI_THEME_APPLY_SUCCESS;
1319} 1319}
1320 1320
1321static Eina_Bool _efl_ui_spinner_smart_focus_next_enable = EINA_FALSE; 1321static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE;
1322 1322
1323EOLIAN static Eina_Bool 1323EOLIAN static Eina_Bool
1324_efl_ui_spinner_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) 1324_elm_spinner_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Spinner_Data *_pd EINA_UNUSED)
1325{ 1325{
1326 EFL_UI_SPINNER_DATA_GET(obj, sd); 1326 ELM_SPINNER_DATA_GET(obj, sd);
1327 1327
1328 return _efl_ui_spinner_smart_focus_next_enable | sd->button_layout; 1328 return _elm_spinner_smart_focus_next_enable | sd->button_layout;
1329} 1329}
1330 1330
1331EOLIAN static Eina_Bool 1331EOLIAN static Eina_Bool
1332_efl_ui_spinner_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) 1332_elm_spinner_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Spinner_Data *_pd EINA_UNUSED)
1333{ 1333{
1334 EFL_UI_SPINNER_DATA_GET(obj, sd); 1334 ELM_SPINNER_DATA_GET(obj, sd);
1335 1335
1336 if (sd->button_layout) return EINA_TRUE; 1336 if (sd->button_layout) return EINA_TRUE;
1337 return EINA_FALSE; 1337 return EINA_FALSE;
1338} 1338}
1339 1339
1340EOLIAN static Eina_Bool 1340EOLIAN static Eina_Bool
1341_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) 1341_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)
1342{ 1342{
1343 Eina_Bool ret; 1343 Eina_Bool ret;
1344 Eina_List *items = NULL; 1344 Eina_List *items = NULL;
1345 void *(*list_data_get)(const Eina_List *list); 1345 void *(*list_data_get)(const Eina_List *list);
1346 1346
1347 EFL_UI_SPINNER_CHECK(obj) EINA_FALSE; 1347 ELM_SPINNER_CHECK(obj) EINA_FALSE;
1348 1348
1349 if (!_pd) 1349 if (!_pd)
1350 return EINA_FALSE; 1350 return EINA_FALSE;
@@ -1376,13 +1376,13 @@ _access_object_get(const Evas_Object *obj, const char* part)
1376} 1376}
1377 1377
1378EOLIAN static Eina_Bool 1378EOLIAN static Eina_Bool
1379_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) 1379_elm_spinner_elm_widget_focus_next(Eo *obj, Elm_Spinner_Data *_pd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
1380{ 1380{
1381 Evas_Object *ao; 1381 Evas_Object *ao;
1382 Eina_List *items = NULL; 1382 Eina_List *items = NULL;
1383 int ret; 1383 int ret;
1384 1384
1385 EFL_UI_SPINNER_CHECK(obj) EINA_FALSE; 1385 ELM_SPINNER_CHECK(obj) EINA_FALSE;
1386 1386
1387 if (_elm_config->access_mode) 1387 if (_elm_config->access_mode)
1388 { 1388 {
@@ -1404,10 +1404,10 @@ _efl_ui_spinner_elm_widget_focus_next(Eo *obj, Efl_Ui_Spinner_Data *_pd, Elm_Foc
1404} 1404}
1405 1405
1406EOLIAN static void 1406EOLIAN static void
1407_efl_ui_spinner_elm_widget_on_access_update(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UNUSED, Eina_Bool acs) 1407_elm_spinner_elm_widget_on_access_update(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED, Eina_Bool acs)
1408{ 1408{
1409 _efl_ui_spinner_smart_focus_next_enable = acs; 1409 _elm_spinner_smart_focus_next_enable = acs;
1410 _access_spinner_register(obj, _efl_ui_spinner_smart_focus_next_enable); 1410 _access_spinner_register(obj, _elm_spinner_smart_focus_next_enable);
1411} 1411}
1412 1412
1413EAPI Evas_Object * 1413EAPI Evas_Object *
@@ -1466,7 +1466,7 @@ elm_spinner_value_get(const Evas_Object *obj)
1466} 1466}
1467 1467
1468EOLIAN static Eo * 1468EOLIAN static Eo *
1469_efl_ui_spinner_efl_object_constructor(Eo *obj, Efl_Ui_Spinner_Data *_pd EINA_UNUSED) 1469_elm_spinner_efl_object_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
1470{ 1470{
1471 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1471 obj = efl_constructor(efl_super(obj, MY_CLASS));
1472 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1472 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
1477} 1477}
1478 1478
1479EOLIAN static void 1479EOLIAN static void
1480_efl_ui_spinner_label_format_set(Eo *obj, Efl_Ui_Spinner_Data *sd, const char *fmt) 1480_elm_spinner_label_format_set(Eo *obj, Elm_Spinner_Data *sd, const char *fmt)
1481{ 1481{
1482 Efl_Ui_Spinner_Format_Type type; 1482 Elm_Spinner_Format_Type type;
1483 1483
1484 if (!fmt) fmt = "%.0f"; 1484 if (!fmt) fmt = "%.0f";
1485 type = _is_label_format_integer(fmt); 1485 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
1502} 1502}
1503 1503
1504EOLIAN static const char* 1504EOLIAN static const char*
1505_efl_ui_spinner_label_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1505_elm_spinner_label_format_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1506{ 1506{
1507 return sd->label; 1507 return sd->label;
1508} 1508}
1509 1509
1510EOLIAN static void 1510EOLIAN static void
1511_efl_ui_spinner_efl_ui_spin_min_max_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double min, double max) 1511_elm_spinner_efl_ui_spin_min_max_set(Eo *obj, Elm_Spinner_Data *sd, double min, double max)
1512{ 1512{
1513 if ((sd->val_min == min) && (sd->val_max == max)) return; 1513 if ((sd->val_min == min) && (sd->val_max == max)) return;
1514 1514
@@ -1523,26 +1523,26 @@ _efl_ui_spinner_efl_ui_spin_min_max_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double
1523} 1523}
1524 1524
1525EOLIAN static void 1525EOLIAN static void
1526_efl_ui_spinner_efl_ui_spin_min_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double *min, double *max) 1526_elm_spinner_efl_ui_spin_min_max_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *min, double *max)
1527{ 1527{
1528 if (min) *min = sd->val_min; 1528 if (min) *min = sd->val_min;
1529 if (max) *max = sd->val_max; 1529 if (max) *max = sd->val_max;
1530} 1530}
1531 1531
1532EOLIAN static void 1532EOLIAN static void
1533_efl_ui_spinner_efl_ui_spin_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double step) 1533_elm_spinner_efl_ui_spin_step_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double step)
1534{ 1534{
1535 sd->step = step; 1535 sd->step = step;
1536} 1536}
1537 1537
1538EOLIAN static double 1538EOLIAN static double
1539_efl_ui_spinner_efl_ui_spin_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1539_elm_spinner_efl_ui_spin_step_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1540{ 1540{
1541 return sd->step; 1541 return sd->step;
1542} 1542}
1543 1543
1544EOLIAN static void 1544EOLIAN static void
1545_efl_ui_spinner_efl_ui_spin_value_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double val) 1545_elm_spinner_efl_ui_spin_value_set(Eo *obj, Elm_Spinner_Data *sd, double val)
1546{ 1546{
1547 if (sd->val == val) return; 1547 if (sd->val == val) return;
1548 1548
@@ -1565,27 +1565,27 @@ _efl_ui_spinner_efl_ui_spin_value_set(Eo *obj, Efl_Ui_Spinner_Data *sd, double v
1565} 1565}
1566 1566
1567EOLIAN static double 1567EOLIAN static double
1568_efl_ui_spinner_efl_ui_spin_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1568_elm_spinner_efl_ui_spin_value_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1569{ 1569{
1570 return sd->val; 1570 return sd->val;
1571} 1571}
1572 1572
1573EOLIAN static void 1573EOLIAN static void
1574_efl_ui_spinner_wrap_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, Eina_Bool wrap) 1574_elm_spinner_wrap_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, Eina_Bool wrap)
1575{ 1575{
1576 sd->wrap = wrap; 1576 sd->wrap = wrap;
1577} 1577}
1578 1578
1579EOLIAN static Eina_Bool 1579EOLIAN static Eina_Bool
1580_efl_ui_spinner_wrap_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1580_elm_spinner_wrap_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1581{ 1581{
1582 return sd->wrap; 1582 return sd->wrap;
1583} 1583}
1584 1584
1585EOLIAN static void 1585EOLIAN static void
1586_efl_ui_spinner_special_value_add(Eo *obj, Efl_Ui_Spinner_Data *sd, double value, const char *label) 1586_elm_spinner_special_value_add(Eo *obj, Elm_Spinner_Data *sd, double value, const char *label)
1587{ 1587{
1588 Efl_Ui_Spinner_Special_Value *sv; 1588 Elm_Spinner_Special_Value *sv;
1589 Eina_List *l; 1589 Eina_List *l;
1590 1590
1591 EINA_LIST_FOREACH(sd->special_values, l, sv) 1591 EINA_LIST_FOREACH(sd->special_values, l, sv)
@@ -1611,11 +1611,11 @@ EAPI void
1611elm_spinner_special_value_del(Evas_Object *obj, 1611elm_spinner_special_value_del(Evas_Object *obj,
1612 double value) 1612 double value)
1613{ 1613{
1614 Efl_Ui_Spinner_Special_Value *sv; 1614 Elm_Spinner_Special_Value *sv;
1615 Eina_List *l; 1615 Eina_List *l;
1616 1616
1617 EFL_UI_SPINNER_CHECK(obj); 1617 ELM_SPINNER_CHECK(obj);
1618 EFL_UI_SPINNER_DATA_GET(obj, sd); 1618 ELM_SPINNER_DATA_GET(obj, sd);
1619 1619
1620 EINA_LIST_FOREACH(sd->special_values, l, sv) 1620 EINA_LIST_FOREACH(sd->special_values, l, sv)
1621 { 1621 {
@@ -1634,11 +1634,11 @@ EAPI const char *
1634elm_spinner_special_value_get(Evas_Object *obj, 1634elm_spinner_special_value_get(Evas_Object *obj,
1635 double value) 1635 double value)
1636{ 1636{
1637 Efl_Ui_Spinner_Special_Value *sv; 1637 Elm_Spinner_Special_Value *sv;
1638 Eina_List *l; 1638 Eina_List *l;
1639 1639
1640 EFL_UI_SPINNER_CHECK(obj) NULL; 1640 ELM_SPINNER_CHECK(obj) NULL;
1641 EFL_UI_SPINNER_DATA_GET(obj, sd); 1641 ELM_SPINNER_DATA_GET(obj, sd);
1642 1642
1643 EINA_LIST_FOREACH(sd->special_values, l, sv) 1643 EINA_LIST_FOREACH(sd->special_values, l, sv)
1644 { 1644 {
@@ -1650,64 +1650,64 @@ elm_spinner_special_value_get(Evas_Object *obj,
1650} 1650}
1651 1651
1652EOLIAN static void 1652EOLIAN static void
1653_efl_ui_spinner_editable_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, Eina_Bool editable) 1653_elm_spinner_editable_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, Eina_Bool editable)
1654{ 1654{
1655 sd->editable = editable; 1655 sd->editable = editable;
1656} 1656}
1657 1657
1658EOLIAN static Eina_Bool 1658EOLIAN static Eina_Bool
1659_efl_ui_spinner_editable_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1659_elm_spinner_editable_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1660{ 1660{
1661 return sd->editable; 1661 return sd->editable;
1662} 1662}
1663 1663
1664EOLIAN static void 1664EOLIAN static void
1665_efl_ui_spinner_efl_ui_spin_interval_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double interval) 1665_elm_spinner_efl_ui_spin_interval_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double interval)
1666{ 1666{
1667 sd->first_interval = interval; 1667 sd->first_interval = interval;
1668} 1668}
1669 1669
1670EOLIAN static double 1670EOLIAN static double
1671_efl_ui_spinner_efl_ui_spin_interval_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1671_elm_spinner_efl_ui_spin_interval_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1672{ 1672{
1673 return sd->first_interval; 1673 return sd->first_interval;
1674} 1674}
1675 1675
1676EOLIAN static void 1676EOLIAN static void
1677_efl_ui_spinner_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, double base) 1677_elm_spinner_base_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double base)
1678{ 1678{
1679 sd->val_base = base; 1679 sd->val_base = base;
1680} 1680}
1681 1681
1682EOLIAN static double 1682EOLIAN static double
1683_efl_ui_spinner_base_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1683_elm_spinner_base_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1684{ 1684{
1685 return sd->val_base; 1685 return sd->val_base;
1686} 1686}
1687 1687
1688EOLIAN static void 1688EOLIAN static void
1689_efl_ui_spinner_round_set(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd, int rnd) 1689_elm_spinner_round_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, int rnd)
1690{ 1690{
1691 sd->round = rnd; 1691 sd->round = rnd;
1692} 1692}
1693 1693
1694EOLIAN static int 1694EOLIAN static int
1695_efl_ui_spinner_round_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1695_elm_spinner_round_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1696{ 1696{
1697 return sd->round; 1697 return sd->round;
1698} 1698}
1699 1699
1700EOLIAN static void 1700EOLIAN static void
1701_efl_ui_spinner_class_constructor(Efl_Class *klass) 1701_elm_spinner_class_constructor(Efl_Class *klass)
1702{ 1702{
1703 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1703 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1704 1704
1705 if (_elm_config->access_mode) 1705 if (_elm_config->access_mode)
1706 _efl_ui_spinner_smart_focus_next_enable = EINA_TRUE; 1706 _elm_spinner_smart_focus_next_enable = EINA_TRUE;
1707} 1707}
1708 1708
1709EOLIAN static const Elm_Atspi_Action * 1709EOLIAN static const Elm_Atspi_Action *
1710_efl_ui_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd EINA_UNUSED) 1710_elm_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd EINA_UNUSED)
1711{ 1711{
1712 static Elm_Atspi_Action atspi_actions[] = { 1712 static Elm_Atspi_Action atspi_actions[] = {
1713 { "toggle", "toggle", NULL, _key_action_toggle}, 1713 { "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
1719// A11Y Accessibility 1719// A11Y Accessibility
1720 1720
1721EOLIAN static void 1721EOLIAN static void
1722_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) 1722_elm_spinner_elm_interface_atspi_value_value_and_text_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *value, const char **text)
1723{ 1723{
1724 if (value) *value = sd->val; 1724 if (value) *value = sd->val;
1725 if (text) *text = NULL; 1725 if (text) *text = NULL;
1726} 1726}
1727 1727
1728EOLIAN static Eina_Bool 1728EOLIAN static Eina_Bool
1729_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) 1729_elm_spinner_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Spinner_Data *sd, double value, const char *text EINA_UNUSED)
1730{ 1730{
1731 if (sd->val_min > value) return EINA_FALSE; 1731 if (sd->val_min > value) return EINA_FALSE;
1732 if (sd->val_max < value) return EINA_FALSE; 1732 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
1738} 1738}
1739 1739
1740EOLIAN static void 1740EOLIAN static void
1741_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) 1741_elm_spinner_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *lower, double *upper, const char **descr)
1742{ 1742{
1743 if (lower) *lower = sd->val_min; 1743 if (lower) *lower = sd->val_min;
1744 if (upper) *upper = sd->val_max; 1744 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_
1746} 1746}
1747 1747
1748EOLIAN static double 1748EOLIAN static double
1749_efl_ui_spinner_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Efl_Ui_Spinner_Data *sd) 1749_elm_spinner_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd)
1750{ 1750{
1751 return sd->step; 1751 return sd->step;
1752} 1752}
1753 1753
1754EOLIAN static const char* 1754EOLIAN static const char*
1755_efl_ui_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Spinner_Data *sd EINA_UNUSED) 1755_elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED)
1756{ 1756{
1757 const char *name; 1757 const char *name;
1758 name = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_SPINNER_CLASS)); 1758 name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_SPINNER_CLASS));
1759 if (name) return name; 1759 if (name) return name;
1760 const char *ret = elm_layout_text_get(obj, "elm.text"); 1760 const char *ret = elm_layout_text_get(obj, "elm.text");
1761 return ret; 1761 return ret;
@@ -1765,8 +1765,8 @@ _efl_ui_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Spinner_
1765 1765
1766/* Internal EO APIs and hidden overrides */ 1766/* Internal EO APIs and hidden overrides */
1767 1767
1768#define EFL_UI_SPINNER_EXTRA_OPS \ 1768#define ELM_SPINNER_EXTRA_OPS \
1769 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_spinner), \ 1769 ELM_LAYOUT_SIZING_EVAL_OPS(elm_spinner), \
1770 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_spinner) 1770 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_spinner)
1771 1771
1772#include "efl_ui_spinner.eo.c" 1772#include "elm_spinner.eo.c"
diff --git a/src/lib/elementary/efl_ui_spinner.eo b/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 @@
1class Efl.Ui.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, 1class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin,
2 Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action) 2 Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action)
3{ 3{
4 [[Elementary spinner class]] 4 [[Elementary spinner class]]
5 legacy_prefix: elm_spinner; 5 legacy_prefix: elm_spinner;
6 eo_prefix: elm_obj_spinner;
6 event_prefix: elm_spinner; 7 event_prefix: elm_spinner;
7 methods { 8 methods {
8 @property wrap { 9 @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 @@
58 */ 58 */
59 59
60#ifdef EFL_EO_API_SUPPORT 60#ifdef EFL_EO_API_SUPPORT
61#include "efl_ui_spinner_eo.h" 61#include "elm_spinner_eo.h"
62#endif 62#endif
63#ifndef EFL_NOLEGACY_API_SUPPORT 63#ifndef EFL_NOLEGACY_API_SUPPORT
64#include "elm_spinner_legacy.h" 64#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);
194 */ 194 */
195EAPI double elm_spinner_value_get(const Evas_Object *obj); 195EAPI double elm_spinner_value_get(const Evas_Object *obj);
196 196
197#include "efl_ui_spinner.eo.legacy.h" 197#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
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 @@
26 * Base layout smart data extended with spinner instance data. 26 * Base layout smart data extended with spinner instance data.
27 */ 27 */
28 28
29typedef enum _Efl_Ui_Spinner_Format_Type 29typedef enum _Elm_Spinner_Format_Type
30{ 30{
31 SPINNER_FORMAT_FLOAT, 31 SPINNER_FORMAT_FLOAT,
32 SPINNER_FORMAT_INT, 32 SPINNER_FORMAT_INT,
33 SPINNER_FORMAT_INVALID 33 SPINNER_FORMAT_INVALID
34} Efl_Ui_Spinner_Format_Type; 34} Elm_Spinner_Format_Type;
35 35
36typedef struct _Efl_Ui_Spinner_Data Efl_Ui_Spinner_Data; 36typedef struct _Elm_Spinner_Data Elm_Spinner_Data;
37struct _Efl_Ui_Spinner_Data 37struct _Elm_Spinner_Data
38{ 38{
39 Evas_Object *ent, *inc_button, *dec_button, *text_button; 39 Evas_Object *ent, *inc_button, *dec_button, *text_button;
40 const char *label; 40 const char *label;
@@ -49,7 +49,7 @@ struct _Efl_Ui_Spinner_Data
49 Ecore_Timer *longpress_timer; /**< a timer to detect long press. After lonpress timeout, 49 Ecore_Timer *longpress_timer; /**< a timer to detect long press. After lonpress timeout,
50 start continuous change of values until mouse up */ 50 start continuous change of values until mouse up */
51 Eina_List *special_values; 51 Eina_List *special_values;
52 Efl_Ui_Spinner_Format_Type format_type; 52 Elm_Spinner_Format_Type format_type;
53 53
54 Eina_Bool entry_visible : 1; 54 Eina_Bool entry_visible : 1;
55 Eina_Bool entry_reactivate : 1; 55 Eina_Bool entry_reactivate : 1;
@@ -61,8 +61,8 @@ struct _Efl_Ui_Spinner_Data
61 Eina_Bool inc_btn_activated : 1; 61 Eina_Bool inc_btn_activated : 1;
62}; 62};
63 63
64typedef struct _Efl_Ui_Spinner_Special_Value Efl_Ui_Spinner_Special_Value; 64typedef struct _Elm_Spinner_Special_Value Elm_Spinner_Special_Value;
65struct _Efl_Ui_Spinner_Special_Value 65struct _Elm_Spinner_Special_Value
66{ 66{
67 double value; 67 double value;
68 const char *label; 68 const char *label;
@@ -72,11 +72,11 @@ struct _Efl_Ui_Spinner_Special_Value
72 * @} 72 * @}
73 */ 73 */
74 74
75#define EFL_UI_SPINNER_DATA_GET(o, sd) \ 75#define ELM_SPINNER_DATA_GET(o, sd) \
76Efl_Ui_Spinner_Data * sd = efl_data_scope_get(o, EFL_UI_SPINNER_CLASS) 76 Elm_Spinner_Data * sd = efl_data_scope_get(o, ELM_SPINNER_CLASS)
77 77
78#define EFL_UI_SPINNER_DATA_GET_OR_RETURN(o, ptr) \ 78#define ELM_SPINNER_DATA_GET_OR_RETURN(o, ptr) \
79 EFL_UI_SPINNER_DATA_GET(o, ptr); \ 79 ELM_SPINNER_DATA_GET(o, ptr); \
80 if (EINA_UNLIKELY(!ptr)) \ 80 if (EINA_UNLIKELY(!ptr)) \
81 { \ 81 { \
82 CRI("No widget data for object %p (%s)", \ 82 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)
84 return; \ 84 return; \
85 } 85 }
86 86
87#define EFL_UI_SPINNER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ 87#define ELM_SPINNER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
88 EFL_UI_SPINNER_DATA_GET(o, ptr); \ 88 ELM_SPINNER_DATA_GET(o, ptr); \
89 if (EINA_UNLIKELY(!ptr)) \ 89 if (EINA_UNLIKELY(!ptr)) \
90 { \ 90 { \
91 CRI("No widget data for object %p (%s)", \ 91 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)
93 return val; \ 93 return val; \
94 } 94 }
95 95
96#define EFL_UI_SPINNER_CHECK(obj) \ 96#define ELM_SPINNER_CHECK(obj) \
97 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_SPINNER_CLASS))) \ 97 if (EINA_UNLIKELY(!efl_isa((obj), ELM_SPINNER_CLASS))) \
98 return 98 return
99 99
100#endif 100#endif