summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-06-12 16:06:22 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-06-12 16:45:47 +0900
commite5922c07205b1c17894f34e52c7be47b2f3088fd (patch)
tree44baf63b1fbd8be83b002891a53b141cac778750
parente95e0a29ffc3f401e0a19cab563352d8899a0268 (diff)
elm: rename elm slider to Efl.Ui.Slider
ref T5361
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am8
-rw-r--r--src/bin/elementary/test_evas_snapshot.c4
-rw-r--r--src/bin/elementary/test_ui_box.c10
-rw-r--r--src/bin/elementary/test_ui_grid.c8
-rw-r--r--src/lib/elementary/efl_ui_slider.c (renamed from src/lib/elementary/elm_slider.c)122
-rw-r--r--src/lib/elementary/efl_ui_slider.eo (renamed from src/lib/elementary/elm_slider.eo)10
-rw-r--r--src/lib/elementary/efl_ui_slider_eo.h1
-rw-r--r--src/lib/elementary/efl_ui_slider_private.h (renamed from src/lib/elementary/elm_widget_slider.h)12
-rw-r--r--src/lib/elementary/elc_player.c8
-rw-r--r--src/lib/elementary/elm_slider.h2
-rw-r--r--src/lib/elementary/elm_slider_eo.h1
-rw-r--r--src/lib/elementary/elm_slider_legacy.h2
-rw-r--r--src/modules/elementary/prefs/elm_slider.c2
14 files changed, 95 insertions, 97 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 43f5597..08a4de4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -156,7 +156,7 @@ src/lib/elementary/elm_route.c
156src/lib/elementary/elm_scroller.c 156src/lib/elementary/elm_scroller.c
157src/lib/elementary/elm_segment_control.c 157src/lib/elementary/elm_segment_control.c
158src/lib/elementary/elm_separator.c 158src/lib/elementary/elm_separator.c
159src/lib/elementary/elm_slider.c 159src/lib/elementary/efl_ui_slider.c
160src/lib/elementary/elm_slideshow.c 160src/lib/elementary/elm_slideshow.c
161src/lib/elementary/elm_spinner.c 161src/lib/elementary/elm_spinner.c
162src/lib/elementary/elm_store.c 162src/lib/elementary/elm_store.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 764fba4..e5c6704 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -61,7 +61,7 @@ elm_public_eolian_files = \
61 lib/elementary/efl_ui_radio.eo \ 61 lib/elementary/efl_ui_radio.eo \
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/elm_slider.eo \ 64 lib/elementary/efl_ui_slider.eo \
65 lib/elementary/elm_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 \
@@ -272,7 +272,7 @@ includesunstable_HEADERS = \
272 lib/elementary/elm_widget_scroller.h \ 272 lib/elementary/elm_widget_scroller.h \
273 lib/elementary/elm_widget_segment_control.h \ 273 lib/elementary/elm_widget_segment_control.h \
274 lib/elementary/elm_widget_separator.h \ 274 lib/elementary/elm_widget_separator.h \
275 lib/elementary/elm_widget_slider.h \ 275 lib/elementary/efl_ui_slider_private.h \
276 lib/elementary/elm_widget_slideshow.h \ 276 lib/elementary/elm_widget_slideshow.h \
277 lib/elementary/elm_widget_spinner.h \ 277 lib/elementary/elm_widget_spinner.h \
278 lib/elementary/elm_widget_table.h \ 278 lib/elementary/elm_widget_table.h \
@@ -492,7 +492,7 @@ includesub_HEADERS = \
492 lib/elementary/elm_separator_legacy.h \ 492 lib/elementary/elm_separator_legacy.h \
493 lib/elementary/elm_slider.h \ 493 lib/elementary/elm_slider.h \
494 lib/elementary/elm_slider_common.h \ 494 lib/elementary/elm_slider_common.h \
495 lib/elementary/elm_slider_eo.h \ 495 lib/elementary/efl_ui_slider_eo.h \
496 lib/elementary/elm_slider_legacy.h \ 496 lib/elementary/elm_slider_legacy.h \
497 lib/elementary/elm_slideshow.h \ 497 lib/elementary/elm_slideshow.h \
498 lib/elementary/elm_slideshow_common.h \ 498 lib/elementary/elm_slideshow_common.h \
@@ -640,7 +640,7 @@ lib_elementary_libelementary_la_SOURCES = \
640 lib/elementary/elm_scroller.c \ 640 lib/elementary/elm_scroller.c \
641 lib/elementary/elm_segment_control.c \ 641 lib/elementary/elm_segment_control.c \
642 lib/elementary/elm_separator.c \ 642 lib/elementary/elm_separator.c \
643 lib/elementary/elm_slider.c \ 643 lib/elementary/efl_ui_slider.c \
644 lib/elementary/elm_slideshow.c \ 644 lib/elementary/elm_slideshow.c \
645 lib/elementary/elm_spinner.c \ 645 lib/elementary/elm_spinner.c \
646 lib/elementary/elm_store.c \ 646 lib/elementary/elm_store.c \
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index d7aa804..e1857ff 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -174,7 +174,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
174 efl_pack_grid(grid, o, 0, 0, GRID_SIZE, GRID_SIZE); 174 efl_pack_grid(grid, o, 0, 0, GRID_SIZE, GRID_SIZE);
175 175
176 // Controls 176 // Controls
177 efl_add(ELM_SLIDER_CLASS, win, 177 efl_add(EFL_UI_SLIDER_CLASS, win,
178 elm_object_text_set(efl_added, "Blur radius: "), 178 elm_object_text_set(efl_added, "Blur radius: "),
179 elm_slider_min_max_set(efl_added, 0, 64), 179 elm_slider_min_max_set(efl_added, 0, 64),
180 elm_slider_value_set(efl_added, 5), 180 elm_slider_value_set(efl_added, 5),
@@ -182,7 +182,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
182 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), 182 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
183 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), 183 efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
184 efl_pack_grid(grid, efl_added, 0, GRID_SIZE, GRID_SIZE, 1), 184 efl_pack_grid(grid, efl_added, 0, GRID_SIZE, GRID_SIZE, 1),
185 efl_event_callback_add(efl_added, ELM_SLIDER_EVENT_CHANGED, _radius_set, win), 185 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win),
186 efl_gfx_visible_set(efl_added, 1)); 186 efl_gfx_visible_set(efl_added, 1));
187 187
188 box = efl_add(EFL_UI_BOX_CLASS, win, 188 box = efl_add(EFL_UI_BOX_CLASS, win,
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index 5b41820..beeb731 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -372,7 +372,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
372 elm_slider_horizontal_set(o, 0); 372 elm_slider_horizontal_set(o, 0);
373 efl_gfx_size_hint_align_set(o, 0.5, -1); 373 efl_gfx_size_hint_align_set(o, 0.5, -1);
374 efl_gfx_size_hint_weight_set(o, 1, 1); 374 efl_gfx_size_hint_weight_set(o, 1, 1);
375 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); 375 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
376 elm_slider_min_max_set(o, 0, 250); 376 elm_slider_min_max_set(o, 0, 250);
377 elm_slider_inverted_set(o, 1); 377 elm_slider_inverted_set(o, 1);
378 elm_slider_value_set(o, 0); 378 elm_slider_value_set(o, 0);
@@ -399,7 +399,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
399 elm_slider_horizontal_set(o, 0); 399 elm_slider_horizontal_set(o, 0);
400 efl_gfx_size_hint_align_set(o, 0.5, -1); 400 efl_gfx_size_hint_align_set(o, 0.5, -1);
401 efl_gfx_size_hint_weight_set(o, 1, 1); 401 efl_gfx_size_hint_weight_set(o, 1, 1);
402 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, win); 402 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, win);
403 elm_slider_min_max_set(o, 0, 40); 403 elm_slider_min_max_set(o, 0, 40);
404 elm_slider_inverted_set(o, 1); 404 elm_slider_inverted_set(o, 1);
405 elm_slider_value_set(o, 10); 405 elm_slider_value_set(o, 10);
@@ -426,7 +426,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
426 elm_slider_horizontal_set(o, 0); 426 elm_slider_horizontal_set(o, 0);
427 efl_gfx_size_hint_align_set(o, 0.5, -1); 427 efl_gfx_size_hint_align_set(o, 0.5, -1);
428 efl_gfx_size_hint_weight_set(o, 1, 1); 428 efl_gfx_size_hint_weight_set(o, 1, 1);
429 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, win); 429 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, win);
430 elm_slider_min_max_set(o, 0, 40); 430 elm_slider_min_max_set(o, 0, 40);
431 elm_slider_inverted_set(o, 1); 431 elm_slider_inverted_set(o, 1);
432 elm_slider_value_set(o, 10); 432 elm_slider_value_set(o, 10);
@@ -453,7 +453,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
453 elm_slider_horizontal_set(o, 0); 453 elm_slider_horizontal_set(o, 0);
454 efl_gfx_size_hint_align_set(o, 0.5, -1); 454 efl_gfx_size_hint_align_set(o, 0.5, -1);
455 efl_gfx_size_hint_weight_set(o, 1, 1); 455 efl_gfx_size_hint_weight_set(o, 1, 1);
456 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignv_slider_cb, win); 456 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, win);
457 elm_slider_min_max_set(o, -0.1, 1.0); 457 elm_slider_min_max_set(o, -0.1, 1.0);
458 elm_slider_step_set(o, 0.1); 458 elm_slider_step_set(o, 0.1);
459 elm_slider_value_set(o, 0.5); 459 elm_slider_value_set(o, 0.5);
@@ -467,7 +467,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
467 efl_gfx_size_hint_align_set(o, 0.5, -1); 467 efl_gfx_size_hint_align_set(o, 0.5, -1);
468 efl_gfx_size_hint_weight_set(o, 1, 0); 468 efl_gfx_size_hint_weight_set(o, 1, 0);
469 efl_gfx_size_hint_min_set(o, 100, 0); 469 efl_gfx_size_hint_min_set(o, 100, 0);
470 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignh_slider_cb, win); 470 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, win);
471 elm_slider_min_max_set(o, -0.1, 1.0); 471 elm_slider_min_max_set(o, -0.1, 1.0);
472 elm_slider_step_set(o, 0.1); 472 elm_slider_step_set(o, 0.1);
473 elm_slider_value_set(o, 0.5); 473 elm_slider_value_set(o, 0.5);
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 62dd813..baa17ae 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -286,7 +286,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
286 elm_slider_horizontal_set(o, 0); 286 elm_slider_horizontal_set(o, 0);
287 efl_gfx_size_hint_align_set(o, 0.5, -1); 287 efl_gfx_size_hint_align_set(o, 0.5, -1);
288 efl_gfx_size_hint_weight_set(o, 1, 1); 288 efl_gfx_size_hint_weight_set(o, 1, 1);
289 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); 289 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
290 elm_slider_min_max_set(o, 0, 250); 290 elm_slider_min_max_set(o, 0, 250);
291 elm_slider_inverted_set(o, 1); 291 elm_slider_inverted_set(o, 1);
292 elm_slider_value_set(o, 0); 292 elm_slider_value_set(o, 0);
@@ -313,7 +313,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
313 elm_slider_horizontal_set(o, 0); 313 elm_slider_horizontal_set(o, 0);
314 efl_gfx_size_hint_align_set(o, 0.5, -1); 314 efl_gfx_size_hint_align_set(o, 0.5, -1);
315 efl_gfx_size_hint_weight_set(o, 1, 1); 315 efl_gfx_size_hint_weight_set(o, 1, 1);
316 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, grid); 316 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, grid);
317 elm_slider_min_max_set(o, 0, 40); 317 elm_slider_min_max_set(o, 0, 40);
318 elm_slider_inverted_set(o, 1); 318 elm_slider_inverted_set(o, 1);
319 elm_slider_value_set(o, 10); 319 elm_slider_value_set(o, 10);
@@ -340,7 +340,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
340 elm_slider_horizontal_set(o, 0); 340 elm_slider_horizontal_set(o, 0);
341 efl_gfx_size_hint_align_set(o, 0.5, -1); 341 efl_gfx_size_hint_align_set(o, 0.5, -1);
342 efl_gfx_size_hint_weight_set(o, 1, 1); 342 efl_gfx_size_hint_weight_set(o, 1, 1);
343 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, grid); 343 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, grid);
344 elm_slider_min_max_set(o, 0, 40); 344 elm_slider_min_max_set(o, 0, 40);
345 elm_slider_inverted_set(o, 1); 345 elm_slider_inverted_set(o, 1);
346 elm_slider_value_set(o, 10); 346 elm_slider_value_set(o, 10);
@@ -367,7 +367,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
367 elm_slider_horizontal_set(o, 0); 367 elm_slider_horizontal_set(o, 0);
368 efl_gfx_size_hint_align_set(o, 0.5, -1); 368 efl_gfx_size_hint_align_set(o, 0.5, -1);
369 efl_gfx_size_hint_weight_set(o, 1, 1); 369 efl_gfx_size_hint_weight_set(o, 1, 1);
370 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, grid); 370 efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, grid);
371 elm_slider_min_max_set(o, 0, 40); 371 elm_slider_min_max_set(o, 0, 40);
372 elm_slider_inverted_set(o, 1); 372 elm_slider_inverted_set(o, 1);
373 elm_slider_value_set(o, 10); 373 elm_slider_value_set(o, 10);
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/efl_ui_slider.c
index 62e80cb..4264a2c 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -10,12 +10,12 @@
10#include <Elementary.h> 10#include <Elementary.h>
11 11
12#include "elm_priv.h" 12#include "elm_priv.h"
13#include "elm_widget_slider.h" 13#include "efl_ui_slider_private.h"
14#include "elm_widget_layout.h" 14#include "elm_widget_layout.h"
15 15
16#define MY_CLASS ELM_SLIDER_CLASS 16#define MY_CLASS EFL_UI_SLIDER_CLASS
17 17
18#define MY_CLASS_NAME "Elm_Slider" 18#define MY_CLASS_NAME "Efl.Ui.Slider"
19#define MY_CLASS_NAME_LEGACY "elm_slider" 19#define MY_CLASS_NAME_LEGACY "elm_slider"
20#define SLIDER_DELAY_CHANGED_INTERVAL 0.2 20#define SLIDER_DELAY_CHANGED_INTERVAL 0.2
21#define SLIDER_STEP 0.05 21#define SLIDER_STEP 0.05
@@ -64,7 +64,7 @@ _delay_change(void *data)
64 ELM_SLIDER_DATA_GET(data, sd); 64 ELM_SLIDER_DATA_GET(data, sd);
65 65
66 sd->delay = NULL; 66 sd->delay = NULL;
67 efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_DELAY_CHANGED, NULL); 67 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_DELAY_CHANGED, NULL);
68 68
69 if (_elm_config->atspi_mode) 69 if (_elm_config->atspi_mode)
70 elm_interface_atspi_accessible_value_changed_signal_emit(data); 70 elm_interface_atspi_accessible_value_changed_signal_emit(data);
@@ -149,7 +149,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
149 sd->range_from = val; 149 sd->range_from = val;
150 if (user_event) 150 if (user_event)
151 { 151 {
152 efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL); 152 efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL);
153 ecore_timer_del(sd->delay); 153 ecore_timer_del(sd->delay);
154 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); 154 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
155 } 155 }
@@ -159,7 +159,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
159 sd->range_to = val2; 159 sd->range_to = val2;
160 if (user_event) 160 if (user_event)
161 { 161 {
162 efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL); 162 efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL);
163 ecore_timer_del(sd->delay); 163 ecore_timer_del(sd->delay);
164 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); 164 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
165 } 165 }
@@ -356,7 +356,7 @@ _drag_start(void *data,
356 if (!elm_widget_focus_get(data)) 356 if (!elm_widget_focus_get(data))
357 elm_object_focus_set(data, EINA_TRUE); 357 elm_object_focus_set(data, EINA_TRUE);
358 _slider_update(data, EINA_TRUE); 358 _slider_update(data, EINA_TRUE);
359 efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL); 359 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
360 elm_widget_scroll_freeze_push(data); 360 elm_widget_scroll_freeze_push(data);
361} 361}
362 362
@@ -367,7 +367,7 @@ _drag_stop(void *data,
367 const char *source EINA_UNUSED) 367 const char *source EINA_UNUSED)
368{ 368{
369 _slider_update(data, EINA_TRUE); 369 _slider_update(data, EINA_TRUE);
370 efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL); 370 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
371 elm_widget_scroll_freeze_pop(data); 371 elm_widget_scroll_freeze_pop(data);
372} 372}
373 373
@@ -565,7 +565,7 @@ _wheel_indicator_timer_cb(void *data)
565} 565}
566 566
567EOLIAN static Eina_Bool 567EOLIAN static Eina_Bool
568_elm_slider_elm_widget_widget_event(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 568_efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
569{ 569{
570 (void) src; 570 (void) src;
571 571
@@ -607,7 +607,7 @@ _elm_slider_elm_widget_widget_event(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Ev
607} 607}
608 608
609EOLIAN static Eina_Bool 609EOLIAN static Eina_Bool
610_elm_slider_elm_widget_activate(Eo *obj, Elm_Slider_Data *sd, Elm_Activate act) 610_efl_ui_slider_elm_widget_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Elm_Activate act)
611{ 611{
612 if (elm_widget_disabled_get(obj)) return EINA_FALSE; 612 if (elm_widget_disabled_get(obj)) return EINA_FALSE;
613 if (act == ELM_ACTIVATE_DEFAULT) return EINA_FALSE; 613 if (act == ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
@@ -692,7 +692,7 @@ _track2_resize_cb(void *data,
692} 692}
693 693
694static void 694static void
695_popup_add(Elm_Slider_Data *sd, Eo *obj, Evas_Object **popup, 695_popup_add(Efl_Ui_Slider_Data *sd, Eo *obj, Evas_Object **popup,
696 Evas_Object **track, Eina_Bool is_range) 696 Evas_Object **track, Eina_Bool is_range)
697{ 697{
698 /* if theme has an overlayed slider mode, then lets support it */ 698 /* if theme has an overlayed slider mode, then lets support it */
@@ -740,7 +740,7 @@ _popup_add(Elm_Slider_Data *sd, Eo *obj, Evas_Object **popup,
740} 740}
741 741
742EOLIAN static Elm_Theme_Apply 742EOLIAN static Elm_Theme_Apply
743_elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd) 743_efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
744{ 744{
745 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 745 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
746 ELM_LAYOUT_DATA_GET(obj, ld); 746 ELM_LAYOUT_DATA_GET(obj, ld);
@@ -853,7 +853,7 @@ _elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd)
853} 853}
854 854
855EOLIAN static void 855EOLIAN static void
856_elm_slider_elm_layout_sizing_eval(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED) 856_efl_ui_slider_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
857{ 857{
858 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 858 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
859 Evas_Coord minw = -1, minh = -1; 859 Evas_Coord minw = -1, minh = -1;
@@ -948,7 +948,7 @@ _spacer_down_cb(void *data,
948 if (!elm_widget_focus_get(data)) 948 if (!elm_widget_focus_get(data))
949 elm_object_focus_set(data, EINA_TRUE); 949 elm_object_focus_set(data, EINA_TRUE);
950 _slider_update(data, EINA_TRUE); 950 _slider_update(data, EINA_TRUE);
951 efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL); 951 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
952 elm_layout_signal_emit(data, "elm,state,indicator,show", "elm"); 952 elm_layout_signal_emit(data, "elm,state,indicator,show", "elm");
953} 953}
954 954
@@ -987,7 +987,7 @@ _spacer_move_cb(void *data,
987 if (sd->spacer_down) sd->spacer_down = EINA_FALSE; 987 if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
988 _slider_update(data, EINA_TRUE); 988 _slider_update(data, EINA_TRUE);
989 efl_event_callback_legacy_call 989 efl_event_callback_legacy_call
990 (data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL); 990 (data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
991 if (sd->frozen) 991 if (sd->frozen)
992 { 992 {
993 elm_widget_scroll_freeze_pop(data); 993 elm_widget_scroll_freeze_pop(data);
@@ -1027,7 +1027,7 @@ _spacer_up_cb(void *data,
1027 if (sd->spacer_down) sd->spacer_down = EINA_FALSE; 1027 if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
1028 1028
1029 _slider_update(data, EINA_TRUE); 1029 _slider_update(data, EINA_TRUE);
1030 efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL); 1030 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
1031 1031
1032 if (sd->frozen) 1032 if (sd->frozen)
1033 { 1033 {
@@ -1072,7 +1072,7 @@ _min_max_set(Evas_Object *obj)
1072} 1072}
1073 1073
1074EOLIAN static void 1074EOLIAN static void
1075_elm_slider_efl_canvas_group_group_calculate(Eo *obj, Elm_Slider_Data *sd) 1075_efl_ui_slider_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Slider_Data *sd)
1076{ 1076{
1077 elm_layout_freeze(obj); 1077 elm_layout_freeze(obj);
1078 1078
@@ -1137,7 +1137,7 @@ _on_show(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
1137} 1137}
1138 1138
1139EOLIAN static void 1139EOLIAN static void
1140_elm_slider_efl_canvas_group_group_add(Eo *obj, Elm_Slider_Data *priv) 1140_efl_ui_slider_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Slider_Data *priv)
1141{ 1141{
1142 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1142 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1143 1143
@@ -1202,7 +1202,7 @@ _elm_slider_efl_canvas_group_group_add(Eo *obj, Elm_Slider_Data *priv)
1202} 1202}
1203 1203
1204EOLIAN static void 1204EOLIAN static void
1205_elm_slider_efl_canvas_group_group_del(Eo *obj, Elm_Slider_Data *sd) 1205_efl_ui_slider_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Slider_Data *sd)
1206{ 1206{
1207 eina_stringshare_del(sd->indicator); 1207 eina_stringshare_del(sd->indicator);
1208 eina_stringshare_del(sd->units); 1208 eina_stringshare_del(sd->units);
@@ -1215,25 +1215,25 @@ _elm_slider_efl_canvas_group_group_del(Eo *obj, Elm_Slider_Data *sd)
1215} 1215}
1216 1216
1217EOLIAN static const Elm_Layout_Part_Alias_Description* 1217EOLIAN static const Elm_Layout_Part_Alias_Description*
1218_elm_slider_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *_pd EINA_UNUSED) 1218_efl_ui_slider_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
1219{ 1219{
1220 return _text_aliases; 1220 return _text_aliases;
1221} 1221}
1222 1222
1223EOLIAN static const Elm_Layout_Part_Alias_Description* 1223EOLIAN static const Elm_Layout_Part_Alias_Description*
1224_elm_slider_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *_pd EINA_UNUSED) 1224_efl_ui_slider_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
1225{ 1225{
1226 return _content_aliases; 1226 return _content_aliases;
1227} 1227}
1228 1228
1229EOLIAN static Eina_Bool 1229EOLIAN static Eina_Bool
1230_elm_slider_range_enabled_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *pd) 1230_efl_ui_slider_range_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd)
1231{ 1231{
1232 return pd->range_enable; 1232 return pd->range_enable;
1233} 1233}
1234 1234
1235EOLIAN static void 1235EOLIAN static void
1236_elm_slider_range_enabled_set(Eo *obj, Elm_Slider_Data *sd, Eina_Bool enable) 1236_efl_ui_slider_range_enabled_set(Eo *obj, Efl_Ui_Slider_Data *sd, Eina_Bool enable)
1237{ 1237{
1238 if (sd->range_enable == enable) return; 1238 if (sd->range_enable == enable) return;
1239 1239
@@ -1254,14 +1254,14 @@ _elm_slider_range_enabled_set(Eo *obj, Elm_Slider_Data *sd, Eina_Bool enable)
1254} 1254}
1255 1255
1256EOLIAN static void 1256EOLIAN static void
1257_elm_slider_range_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *pd, double *from, double *to) 1257_efl_ui_slider_range_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd, double *from, double *to)
1258{ 1258{
1259 if (from) *from = fmin(pd->range_from, pd->range_to); 1259 if (from) *from = fmin(pd->range_from, pd->range_to);
1260 if (to) *to = fmax(pd->range_from, pd->range_to); 1260 if (to) *to = fmax(pd->range_from, pd->range_to);
1261} 1261}
1262 1262
1263EOLIAN static void 1263EOLIAN static void
1264_elm_slider_range_set(Eo *obj, Elm_Slider_Data *pd, double from, double to) 1264_efl_ui_slider_range_set(Eo *obj, Efl_Ui_Slider_Data *pd, double from, double to)
1265{ 1265{
1266 pd->range_from = from; 1266 pd->range_from = from;
1267 //TODO: remove val later 1267 //TODO: remove val later
@@ -1283,7 +1283,7 @@ elm_slider_add(Evas_Object *parent)
1283} 1283}
1284 1284
1285EOLIAN static Eo * 1285EOLIAN static Eo *
1286_elm_slider_efl_object_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED) 1286_efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
1287{ 1287{
1288 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1288 obj = efl_constructor(efl_super(obj, MY_CLASS));
1289 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1289 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -1381,7 +1381,7 @@ elm_slider_units_format_function_set(Evas_Object *obj, slider_func_type func, sl
1381} 1381}
1382 1382
1383EOLIAN static void 1383EOLIAN static void
1384_elm_slider_efl_orientation_orientation_set(Eo *obj, Elm_Slider_Data *sd, Efl_Orient dir) 1384_efl_ui_slider_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Orient dir)
1385{ 1385{
1386 sd->orientation = dir; 1386 sd->orientation = dir;
1387 1387
@@ -1389,13 +1389,13 @@ _elm_slider_efl_orientation_orientation_set(Eo *obj, Elm_Slider_Data *sd, Efl_Or
1389} 1389}
1390 1390
1391EOLIAN static Efl_Orient 1391EOLIAN static Efl_Orient
1392_elm_slider_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1392_efl_ui_slider_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1393{ 1393{
1394 return sd->orientation; 1394 return sd->orientation;
1395} 1395}
1396 1396
1397EOLIAN static void 1397EOLIAN static void
1398_elm_slider_efl_ui_progress_span_size_set(Eo *obj, Elm_Slider_Data *sd, Evas_Coord size) 1398_efl_ui_slider_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Evas_Coord size)
1399{ 1399{
1400 if (sd->size == size) return; 1400 if (sd->size == size) return;
1401 sd->size = size; 1401 sd->size = size;
@@ -1421,13 +1421,13 @@ _elm_slider_efl_ui_progress_span_size_set(Eo *obj, Elm_Slider_Data *sd, Evas_Coo
1421} 1421}
1422 1422
1423EOLIAN static Evas_Coord 1423EOLIAN static Evas_Coord
1424_elm_slider_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1424_efl_ui_slider_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1425{ 1425{
1426 return sd->size; 1426 return sd->size;
1427} 1427}
1428 1428
1429EOLIAN static void 1429EOLIAN static void
1430_elm_slider_efl_ui_progress_unit_format_set(Eo *obj, Elm_Slider_Data *sd, const char *units) 1430_efl_ui_slider_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Slider_Data *sd, const char *units)
1431{ 1431{
1432 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1432 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1433 1433
@@ -1454,26 +1454,26 @@ _elm_slider_efl_ui_progress_unit_format_set(Eo *obj, Elm_Slider_Data *sd, const
1454} 1454}
1455 1455
1456EOLIAN static const char * 1456EOLIAN static const char *
1457_elm_slider_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1457_efl_ui_slider_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1458{ 1458{
1459 return sd->units; 1459 return sd->units;
1460} 1460}
1461 1461
1462EOLIAN static void 1462EOLIAN static void
1463_elm_slider_indicator_format_set(Eo *obj, Elm_Slider_Data *sd, const char *indicator) 1463_efl_ui_slider_indicator_format_set(Eo *obj, Efl_Ui_Slider_Data *sd, const char *indicator)
1464{ 1464{
1465 eina_stringshare_replace(&sd->indicator, indicator); 1465 eina_stringshare_replace(&sd->indicator, indicator);
1466 evas_object_smart_changed(obj); 1466 evas_object_smart_changed(obj);
1467} 1467}
1468 1468
1469EOLIAN static const char* 1469EOLIAN static const char*
1470_elm_slider_indicator_format_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1470_efl_ui_slider_indicator_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1471{ 1471{
1472 return sd->indicator; 1472 return sd->indicator;
1473} 1473}
1474 1474
1475EOLIAN static void 1475EOLIAN static void
1476_elm_slider_min_max_set(Eo *obj, Elm_Slider_Data *sd, double min, double max) 1476_efl_ui_slider_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max)
1477{ 1477{
1478 if ((sd->val_min == min) && (sd->val_max == max)) return; 1478 if ((sd->val_min == min) && (sd->val_max == max)) return;
1479 sd->val_min = min; 1479 sd->val_min = min;
@@ -1485,14 +1485,14 @@ _elm_slider_min_max_set(Eo *obj, Elm_Slider_Data *sd, double min, double max)
1485} 1485}
1486 1486
1487EOLIAN static void 1487EOLIAN static void
1488_elm_slider_min_max_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, double *min, double *max) 1488_efl_ui_slider_min_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max)
1489{ 1489{
1490 if (min) *min = sd->val_min; 1490 if (min) *min = sd->val_min;
1491 if (max) *max = sd->val_max; 1491 if (max) *max = sd->val_max;
1492} 1492}
1493 1493
1494EOLIAN static void 1494EOLIAN static void
1495_elm_slider_efl_ui_progress_progress_value_set(Eo *obj, Elm_Slider_Data *sd, double val) 1495_efl_ui_slider_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val)
1496{ 1496{
1497 if (sd->val == val) return; 1497 if (sd->val == val) return;
1498 sd->val = val; 1498 sd->val = val;
@@ -1505,13 +1505,13 @@ _elm_slider_efl_ui_progress_progress_value_set(Eo *obj, Elm_Slider_Data *sd, dou
1505} 1505}
1506 1506
1507EOLIAN static double 1507EOLIAN static double
1508_elm_slider_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1508_efl_ui_slider_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1509{ 1509{
1510 return sd->val; 1510 return sd->val;
1511} 1511}
1512 1512
1513EOLIAN static void 1513EOLIAN static void
1514_elm_slider_indicator_format_function_set(Eo *obj, Elm_Slider_Data *sd, slider_func_type func, slider_freefunc_type free_func) 1514_efl_ui_slider_indicator_format_function_set(Eo *obj, Efl_Ui_Slider_Data *sd, slider_func_type func, slider_freefunc_type free_func)
1515{ 1515{
1516 sd->indicator_format_func = func; 1516 sd->indicator_format_func = func;
1517 sd->indicator_format_free = free_func; 1517 sd->indicator_format_free = free_func;
@@ -1519,7 +1519,7 @@ _elm_slider_indicator_format_function_set(Eo *obj, Elm_Slider_Data *sd, slider_f
1519} 1519}
1520 1520
1521EOLIAN static void 1521EOLIAN static void
1522_elm_slider_indicator_show_set(Eo *obj, Elm_Slider_Data *sd, Eina_Bool show) 1522_efl_ui_slider_indicator_show_set(Eo *obj, Efl_Ui_Slider_Data *sd, Eina_Bool show)
1523{ 1523{
1524 if (show) 1524 if (show)
1525 { 1525 {
@@ -1544,13 +1544,13 @@ _elm_slider_indicator_show_set(Eo *obj, Elm_Slider_Data *sd, Eina_Bool show)
1544} 1544}
1545 1545
1546EOLIAN static Eina_Bool 1546EOLIAN static Eina_Bool
1547_elm_slider_indicator_show_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1547_efl_ui_slider_indicator_show_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1548{ 1548{
1549 return sd->indicator_show; 1549 return sd->indicator_show;
1550} 1550}
1551 1551
1552EOLIAN static void 1552EOLIAN static void
1553_elm_slider_step_set(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, double step) 1553_efl_ui_slider_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double step)
1554{ 1554{
1555 if (sd->step == step) return; 1555 if (sd->step == step) return;
1556 1556
@@ -1561,13 +1561,13 @@ _elm_slider_step_set(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, double step)
1561} 1561}
1562 1562
1563EOLIAN static double 1563EOLIAN static double
1564_elm_slider_step_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1564_efl_ui_slider_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1565{ 1565{
1566 return sd->step; 1566 return sd->step;
1567} 1567}
1568 1568
1569EOLIAN static void 1569EOLIAN static void
1570_elm_slider_indicator_show_on_focus_set(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, Eina_Bool flag) 1570_efl_ui_slider_indicator_show_on_focus_set(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, Eina_Bool flag)
1571{ 1571{
1572 if (flag) 1572 if (flag)
1573 sd->indicator_visible_mode = ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS; 1573 sd->indicator_visible_mode = ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS;
@@ -1576,38 +1576,38 @@ _elm_slider_indicator_show_on_focus_set(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd
1576} 1576}
1577 1577
1578EOLIAN static Eina_Bool 1578EOLIAN static Eina_Bool
1579_elm_slider_indicator_show_on_focus_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1579_efl_ui_slider_indicator_show_on_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1580{ 1580{
1581 return (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS); 1581 return (sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS);
1582} 1582}
1583 1583
1584EOLIAN static void 1584EOLIAN static void
1585_elm_slider_indicator_visible_mode_set(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode) 1585_efl_ui_slider_indicator_visible_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode)
1586{ 1586{
1587 if (sd->indicator_visible_mode == indicator_visible_mode) return; 1587 if (sd->indicator_visible_mode == indicator_visible_mode) return;
1588 sd->indicator_visible_mode = indicator_visible_mode; 1588 sd->indicator_visible_mode = indicator_visible_mode;
1589} 1589}
1590 1590
1591EOLIAN static Elm_Slider_Indicator_Visible_Mode 1591EOLIAN static Elm_Slider_Indicator_Visible_Mode
1592_elm_slider_indicator_visible_mode_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1592_efl_ui_slider_indicator_visible_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1593{ 1593{
1594 return sd->indicator_visible_mode; 1594 return sd->indicator_visible_mode;
1595} 1595}
1596 1596
1597EOLIAN static Eina_Bool 1597EOLIAN static Eina_Bool
1598_elm_slider_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Slider_Data *_pd EINA_UNUSED) 1598_efl_ui_slider_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
1599{ 1599{
1600 return EINA_FALSE; 1600 return EINA_FALSE;
1601} 1601}
1602 1602
1603EOLIAN static Eina_Bool 1603EOLIAN static Eina_Bool
1604_elm_slider_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Slider_Data *_pd EINA_UNUSED) 1604_efl_ui_slider_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
1605{ 1605{
1606 return EINA_FALSE; 1606 return EINA_FALSE;
1607} 1607}
1608 1608
1609EOLIAN static Eina_Bool 1609EOLIAN static Eina_Bool
1610_elm_slider_elm_widget_on_focus(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) 1610_efl_ui_slider_elm_widget_on_focus(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
1611{ 1611{
1612 Eina_Bool int_ret = EINA_FALSE; 1612 Eina_Bool int_ret = EINA_FALSE;
1613 1613
@@ -1622,7 +1622,7 @@ _elm_slider_elm_widget_on_focus(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Elm_Ob
1622} 1622}
1623 1623
1624EOLIAN static void 1624EOLIAN static void
1625_elm_slider_class_constructor(Efl_Class *klass) 1625_efl_ui_slider_class_constructor(Efl_Class *klass)
1626{ 1626{
1627 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1627 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1628} 1628}
@@ -1630,32 +1630,32 @@ _elm_slider_class_constructor(Efl_Class *klass)
1630// A11Y Accessibility 1630// A11Y Accessibility
1631 1631
1632EOLIAN static void 1632EOLIAN static void
1633_elm_slider_elm_interface_atspi_value_value_and_text_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, double *value, const char **text) 1633_efl_ui_slider_elm_interface_atspi_value_value_and_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *value, const char **text)
1634{ 1634{
1635 if (value) *value = sd->val; 1635 if (value) *value = sd->val;
1636 if (text) *text = NULL; 1636 if (text) *text = NULL;
1637} 1637}
1638 1638
1639EOLIAN static Eina_Bool 1639EOLIAN static Eina_Bool
1640_elm_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Slider_Data *sd, double value, const char *text EINA_UNUSED) 1640_efl_ui_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Efl_Ui_Slider_Data *sd, double value, const char *text EINA_UNUSED)
1641{ 1641{
1642 double oldval = sd->val; 1642 double oldval = sd->val;
1643 1643
1644 if (value < sd->val_min) value = sd->val_min; 1644 if (value < sd->val_min) value = sd->val_min;
1645 if (value > sd->val_max) value = sd->val_max; 1645 if (value > sd->val_max) value = sd->val_max;
1646 1646
1647 efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL); 1647 efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
1648 sd->val = value; 1648 sd->val = value;
1649 _visuals_refresh(obj); 1649 _visuals_refresh(obj);
1650 sd->val = oldval; 1650 sd->val = oldval;
1651 _slider_update(obj, EINA_TRUE); 1651 _slider_update(obj, EINA_TRUE);
1652 efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL); 1652 efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
1653 1653
1654 return EINA_TRUE; 1654 return EINA_TRUE;
1655} 1655}
1656 1656
1657EOLIAN static void 1657EOLIAN static void
1658_elm_slider_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, double *lower, double *upper, const char **descr) 1658_efl_ui_slider_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *lower, double *upper, const char **descr)
1659{ 1659{
1660 if (lower) *lower = sd->val_min; 1660 if (lower) *lower = sd->val_min;
1661 if (upper) *upper = sd->val_max; 1661 if (upper) *upper = sd->val_max;
@@ -1663,13 +1663,13 @@ _elm_slider_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Elm_Slider_
1663} 1663}
1664 1664
1665EOLIAN static double 1665EOLIAN static double
1666_elm_slider_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd) 1666_efl_ui_slider_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1667{ 1667{
1668 return sd->step; 1668 return sd->step;
1669} 1669}
1670 1670
1671EOLIAN const Elm_Atspi_Action * 1671EOLIAN const Elm_Atspi_Action *
1672_elm_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *pd EINA_UNUSED) 1672_efl_ui_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd EINA_UNUSED)
1673{ 1673{
1674 static Elm_Atspi_Action atspi_actions[] = { 1674 static Elm_Atspi_Action atspi_actions[] = {
1675 { "drag,left", "drag", "left", _key_action_drag}, 1675 { "drag,left", "drag", "left", _key_action_drag},
@@ -1685,7 +1685,7 @@ _elm_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
1685 1685
1686/* Internal EO APIs and hidden overrides */ 1686/* Internal EO APIs and hidden overrides */
1687 1687
1688#define ELM_SLIDER_EXTRA_OPS \ 1688#define EFL_UI_SLIDER_EXTRA_OPS \
1689 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_slider) 1689 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider)
1690 1690
1691#include "elm_slider.eo.c" 1691#include "efl_ui_slider.eo.c"
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index c70cb30..dbc8da2 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,15 +1,13 @@
1type slider_func_type: __undefined_type; [[Elementary slider function type]] 1type slider_func_type: __undefined_type; [[Elementary slider function type]]
2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]] 2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
3 3
4class Elm.Slider (Elm.Layout, Efl.Ui.Progress, 4class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Progress,
5 Efl.Orientation, 5 Efl.Orientation,
6 Elm.Interface.Atspi.Value, 6 Elm.Interface.Atspi.Value,
7 Elm.Interface.Atspi_Widget_Action) 7 Elm.Interface.Atspi_Widget_Action)
8{ 8{
9 [[Elementary slider class]] 9 [[Elementary slider class]]
10 legacy_prefix: elm_slider; 10 legacy_prefix: elm_slider;
11 eo_prefix: elm_obj_slider;
12 event_prefix: elm_slider;
13 methods { 11 methods {
14 @property indicator_format { 12 @property indicator_format {
15 set { 13 set {
diff --git a/src/lib/elementary/efl_ui_slider_eo.h b/src/lib/elementary/efl_ui_slider_eo.h
new file mode 100644
index 0000000..74abf10
--- /dev/null
+++ b/src/lib/elementary/efl_ui_slider_eo.h
@@ -0,0 +1 @@
#include "efl_ui_slider.eo.h"
diff --git a/src/lib/elementary/elm_widget_slider.h b/src/lib/elementary/efl_ui_slider_private.h
index ee23efa..4667f07 100644
--- a/src/lib/elementary/elm_widget_slider.h
+++ b/src/lib/elementary/efl_ui_slider_private.h
@@ -1,5 +1,5 @@
1#ifndef ELM_WIDGET_SLIDER_H 1#ifndef EFL_UI_SLIDER_PRIVATE_H
2#define ELM_WIDGET_SLIDER_H 2#define EFL_UI_SLIDER_PRIVATE_H
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
@@ -23,8 +23,8 @@
23/** 23/**
24 * Base layout smart data extended with slider instance data. 24 * Base layout smart data extended with slider instance data.
25 */ 25 */
26typedef struct _Elm_Slider_Data Elm_Slider_Data; 26typedef struct _Efl_Ui_Slider_Data Efl_Ui_Slider_Data;
27struct _Elm_Slider_Data 27struct _Efl_Ui_Slider_Data
28{ 28{
29 Evas_Object *spacer, *popup, *popup2, *track, *track2; 29 Evas_Object *spacer, *popup, *popup2, *track, *track2;
30 Ecore_Timer *delay; 30 Ecore_Timer *delay;
@@ -64,7 +64,7 @@ struct _Elm_Slider_Data
64 */ 64 */
65 65
66#define ELM_SLIDER_DATA_GET(o, sd) \ 66#define ELM_SLIDER_DATA_GET(o, sd) \
67 Elm_Slider_Data * sd = efl_data_scope_get(o, ELM_SLIDER_CLASS) 67 Efl_Ui_Slider_Data * sd = efl_data_scope_get(o, EFL_UI_SLIDER_CLASS)
68 68
69#define ELM_SLIDER_DATA_GET_OR_RETURN(o, ptr) \ 69#define ELM_SLIDER_DATA_GET_OR_RETURN(o, ptr) \
70 ELM_SLIDER_DATA_GET(o, ptr); \ 70 ELM_SLIDER_DATA_GET(o, ptr); \
@@ -85,7 +85,7 @@ struct _Elm_Slider_Data
85 } 85 }
86 86
87#define ELM_SLIDER_CHECK(obj) \ 87#define ELM_SLIDER_CHECK(obj) \
88 if (EINA_UNLIKELY(!efl_isa((obj), ELM_SLIDER_CLASS))) \ 88 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_SLIDER_CLASS))) \
89 return 89 return
90 90
91#endif 91#endif
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index a8725a2..bde0f04 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -87,9 +87,9 @@ EFL_CALLBACKS_ARRAY_DEFINE(_emotion_cb,
87); 87);
88 88
89EFL_CALLBACKS_ARRAY_DEFINE(_slider_cb, 89EFL_CALLBACKS_ARRAY_DEFINE(_slider_cb,
90 { ELM_SLIDER_EVENT_CHANGED, _update_position }, 90 { EFL_UI_SLIDER_EVENT_CHANGED, _update_position },
91 { ELM_SLIDER_EVENT_SLIDER_DRAG_START, _drag_start }, 91 { EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, _drag_start },
92 { ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, _drag_stop } 92 { EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, _drag_stop }
93); 93);
94 94
95static Eina_Bool 95static Eina_Bool
@@ -657,7 +657,7 @@ _elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
657 elm_layout_content_set(obj, "elm.swallow.media_player.volumeslider", 657 elm_layout_content_set(obj, "elm.swallow.media_player.volumeslider",
658 priv->vslider); 658 priv->vslider);
659 efl_event_callback_add 659 efl_event_callback_add
660 (priv->vslider, ELM_SLIDER_EVENT_CHANGED, _update_volume, obj); 660 (priv->vslider, EFL_UI_SLIDER_EVENT_CHANGED, _update_volume, obj);
661 661
662 elm_layout_sizing_eval(obj); 662 elm_layout_sizing_eval(obj);
663 elm_widget_can_focus_set(obj, EINA_TRUE); 663 elm_widget_can_focus_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/elm_slider.h b/src/lib/elementary/elm_slider.h
index 00a37c0..9264fc6 100644
--- a/src/lib/elementary/elm_slider.h
+++ b/src/lib/elementary/elm_slider.h
@@ -76,7 +76,7 @@
76 76
77#include "elm_slider_common.h" 77#include "elm_slider_common.h"
78#ifdef EFL_EO_API_SUPPORT 78#ifdef EFL_EO_API_SUPPORT
79#include "elm_slider_eo.h" 79#include "efl_ui_slider_eo.h"
80#endif 80#endif
81#ifndef EFL_NOLEGACY_API_SUPPORT 81#ifndef EFL_NOLEGACY_API_SUPPORT
82#include "elm_slider_legacy.h" 82#include "elm_slider_legacy.h"
diff --git a/src/lib/elementary/elm_slider_eo.h b/src/lib/elementary/elm_slider_eo.h
deleted file mode 100644
index bb87e3d..0000000
--- a/src/lib/elementary/elm_slider_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_slider.eo.h"
diff --git a/src/lib/elementary/elm_slider_legacy.h b/src/lib/elementary/elm_slider_legacy.h
index e6e67de..9fa4546 100644
--- a/src/lib/elementary/elm_slider_legacy.h
+++ b/src/lib/elementary/elm_slider_legacy.h
@@ -159,4 +159,4 @@ EAPI const char *elm_slider_unit_format_get(const Evas_Object *obj);
159 */ 159 */
160EAPI void elm_slider_units_format_function_set(Evas_Object *obj, slider_func_type func, slider_freefunc_type free_func); 160EAPI void elm_slider_units_format_function_set(Evas_Object *obj, slider_func_type func, slider_freefunc_type free_func);
161 161
162#include "elm_slider.eo.legacy.h" \ No newline at end of file 162#include "efl_ui_slider.eo.legacy.h" \ No newline at end of file
diff --git a/src/modules/elementary/prefs/elm_slider.c b/src/modules/elementary/prefs/elm_slider.c
index 9b88ef0..961d76a 100644
--- a/src/modules/elementary/prefs/elm_slider.c
+++ b/src/modules/elementary/prefs/elm_slider.c
@@ -27,7 +27,7 @@ elm_prefs_slider_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
27 evas_object_data_set(obj, "prefs_type", (void *)type); 27 evas_object_data_set(obj, "prefs_type", (void *)type);
28 28
29 efl_event_callback_add 29 efl_event_callback_add
30 (obj, ELM_SLIDER_EVENT_CHANGED, _item_changed_cb, cb); 30 (obj, EFL_UI_SLIDER_EVENT_CHANGED, _item_changed_cb, cb);
31 if (type == ELM_PREFS_TYPE_INT) 31 if (type == ELM_PREFS_TYPE_INT)
32 { 32 {
33 elm_slider_unit_format_set(obj, "%1.0f"); 33 elm_slider_unit_format_set(obj, "%1.0f");