summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-05-23 18:30:00 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-05-23 19:05:48 +0900
commitf6b81f0a1ee70be0b6ad499e8598048a73f06a5b (patch)
tree1206fa8b002c6d0ed540bd28901fc34456c33ba7
parent997d0261fb5e436d9398ae8f5ce3d8aa58796bcc (diff)
elm: rename elm_progressbar to Efl.Ui.Progressbar
ref T5360 Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am10
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c (renamed from src/lib/elementary/elm_progressbar.c)112
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo (renamed from src/lib/elementary/elm_progressbar.eo)6
-rw-r--r--src/lib/elementary/efl_ui_progressbar_eo.h1
-rw-r--r--src/lib/elementary/efl_ui_progressbar_internal_part.eo (renamed from src/lib/elementary/elm_progressbar_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_private.h (renamed from src/lib/elementary/elm_widget_progressbar.h)16
-rw-r--r--src/lib/elementary/elm_progressbar.h2
-rw-r--r--src/lib/elementary/elm_progressbar_eo.h1
-rw-r--r--src/lib/elementary/elm_progressbar_legacy.h2
10 files changed, 76 insertions, 78 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5157cf..d577098 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -150,7 +150,7 @@ src/lib/elementary/elm_photocam.c
150src/lib/elementary/elm_plug.c 150src/lib/elementary/elm_plug.c
151src/lib/elementary/elm_prefs.c 151src/lib/elementary/elm_prefs.c
152src/lib/elementary/elm_prefs_data.c 152src/lib/elementary/elm_prefs_data.c
153src/lib/elementary/elm_progressbar.c 153src/lib/elementary/efl_ui_progressbar.c
154src/lib/elementary/efl_ui_radio.c 154src/lib/elementary/efl_ui_radio.c
155src/lib/elementary/elm_route.c 155src/lib/elementary/elm_route.c
156src/lib/elementary/elm_scroller.c 156src/lib/elementary/elm_scroller.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 7c8accb..b9a89a8 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -57,7 +57,7 @@ elm_public_eolian_files = \
57 lib/elementary/elm_player.eo \ 57 lib/elementary/elm_player.eo \
58 lib/elementary/elm_plug.eo \ 58 lib/elementary/elm_plug.eo \
59 lib/elementary/elm_popup.eo \ 59 lib/elementary/elm_popup.eo \
60 lib/elementary/elm_progressbar.eo \ 60 lib/elementary/efl_ui_progressbar.eo \
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 \
@@ -107,7 +107,7 @@ elm_public_eolian_files = \
107 lib/elementary/elm_notify_internal_part.eo \ 107 lib/elementary/elm_notify_internal_part.eo \
108 lib/elementary/elm_panel_internal_part.eo \ 108 lib/elementary/elm_panel_internal_part.eo \
109 lib/elementary/elm_player_internal_part.eo \ 109 lib/elementary/elm_player_internal_part.eo \
110 lib/elementary/elm_progressbar_internal_part.eo \ 110 lib/elementary/efl_ui_progressbar_internal_part.eo \
111 lib/elementary/elm_popup_internal_part.eo \ 111 lib/elementary/elm_popup_internal_part.eo \
112 lib/elementary/elm_scroller_internal_part.eo \ 112 lib/elementary/elm_scroller_internal_part.eo \
113 lib/elementary/elm_code_widget.eo \ 113 lib/elementary/elm_code_widget.eo \
@@ -260,7 +260,7 @@ includesunstable_HEADERS = \
260 lib/elementary/elm_widget_plug.h \ 260 lib/elementary/elm_widget_plug.h \
261 lib/elementary/elm_widget_popup.h \ 261 lib/elementary/elm_widget_popup.h \
262 lib/elementary/elm_widget_prefs.h \ 262 lib/elementary/elm_widget_prefs.h \
263 lib/elementary/elm_widget_progressbar.h \ 263 lib/elementary/efl_ui_progressbar_private.h \
264 lib/elementary/efl_ui_radio_private.h \ 264 lib/elementary/efl_ui_radio_private.h \
265 lib/elementary/elm_widget_route.h \ 265 lib/elementary/elm_widget_route.h \
266 lib/elementary/elm_widget_scroller.h \ 266 lib/elementary/elm_widget_scroller.h \
@@ -467,7 +467,7 @@ includesub_HEADERS = \
467 lib/elementary/elm_prefs_data.h \ 467 lib/elementary/elm_prefs_data.h \
468 lib/elementary/elm_progressbar.h \ 468 lib/elementary/elm_progressbar.h \
469 lib/elementary/elm_progressbar_common.h \ 469 lib/elementary/elm_progressbar_common.h \
470 lib/elementary/elm_progressbar_eo.h \ 470 lib/elementary/efl_ui_progressbar_eo.h \
471 lib/elementary/elm_progressbar_legacy.h \ 471 lib/elementary/elm_progressbar_legacy.h \
472 lib/elementary/elm_radio.h \ 472 lib/elementary/elm_radio.h \
473 lib/elementary/efl_ui_radio_eo.h \ 473 lib/elementary/efl_ui_radio_eo.h \
@@ -628,7 +628,7 @@ lib_elementary_libelementary_la_SOURCES = \
628 lib/elementary/elm_prefs.c \ 628 lib/elementary/elm_prefs.c \
629 lib/elementary/elm_prefs_data.c \ 629 lib/elementary/elm_prefs_data.c \
630 lib/elementary/elm_prefs_edd.x \ 630 lib/elementary/elm_prefs_edd.x \
631 lib/elementary/elm_progressbar.c \ 631 lib/elementary/efl_ui_progressbar.c \
632 lib/elementary/efl_ui_radio.c \ 632 lib/elementary/efl_ui_radio.c \
633 lib/elementary/elm_route.c \ 633 lib/elementary/elm_route.c \
634 lib/elementary/elm_scroller.c \ 634 lib/elementary/elm_scroller.c \
diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 4f2c6f6..d042d58 100644
--- a/src/lib/elementary/elm_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -8,15 +8,15 @@
8#include <Elementary.h> 8#include <Elementary.h>
9 9
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_progressbar.h" 11#include "efl_ui_progressbar_private.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13 13
14#include "elm_progressbar_internal_part.eo.h" 14#include "efl_ui_progressbar_internal_part.eo.h"
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS ELM_PROGRESSBAR_CLASS 17#define MY_CLASS EFL_UI_PROGRESSBAR_CLASS
18 18
19#define MY_CLASS_NAME "Elm_Progressbar" 19#define MY_CLASS_NAME "Efl.Ui.Progressbar"
20#define MY_CLASS_NAME_LEGACY "elm_progressbar" 20#define MY_CLASS_NAME_LEGACY "elm_progressbar"
21 21
22static const char SIG_CHANGED[] = "changed"; 22static const char SIG_CHANGED[] = "changed";
@@ -47,18 +47,18 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] =
47 {NULL, NULL} 47 {NULL, NULL}
48}; 48};
49 49
50static Elm_Progress_Status * 50static Efl_Ui_Progress_Status *
51_progress_status_new(const char *part_name, double val) 51_progress_status_new(const char *part_name, double val)
52{ 52{
53 Elm_Progress_Status *ps; 53 Efl_Ui_Progress_Status *ps;
54 ps = calloc(1, sizeof(Elm_Progress_Status)); 54 ps = calloc(1, sizeof(Efl_Ui_Progress_Status));
55 ps->part_name = eina_stringshare_add(part_name); 55 ps->part_name = eina_stringshare_add(part_name);
56 ps->val = val; 56 ps->val = val;
57 return ps; 57 return ps;
58} 58}
59 59
60static inline void 60static inline void
61_progress_status_free(Elm_Progress_Status *ps) 61_progress_status_free(Efl_Ui_Progress_Status *ps)
62{ 62{
63 eina_stringshare_del(ps->part_name); 63 eina_stringshare_del(ps->part_name);
64 free(ps); 64 free(ps);
@@ -117,7 +117,7 @@ _val_set(Evas_Object *obj)
117 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 117 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
118 118
119 rtl = elm_widget_mirrored_get(obj); 119 rtl = elm_widget_mirrored_get(obj);
120 Elm_Progress_Status *ps; 120 Efl_Ui_Progress_Status *ps;
121 Eina_List *l; 121 Eina_List *l;
122 122
123 EINA_LIST_FOREACH(sd->progress_status, l, ps) 123 EINA_LIST_FOREACH(sd->progress_status, l, ps)
@@ -134,7 +134,7 @@ _val_set(Evas_Object *obj)
134} 134}
135 135
136EOLIAN static void 136EOLIAN static void
137_elm_progressbar_elm_layout_sizing_eval(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED) 137_efl_ui_progressbar_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
138{ 138{
139 Evas_Coord minw = -1, minh = -1; 139 Evas_Coord minw = -1, minh = -1;
140 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 140 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -163,7 +163,7 @@ _icon_signal_emit(Evas_Object *obj)
163 * spot is elm.swallow.content, not elm.swallow.icon. Fix that 163 * spot is elm.swallow.content, not elm.swallow.icon. Fix that
164 * whenever we can changed the theme API */ 164 * whenever we can changed the theme API */
165EOLIAN static Eina_Bool 165EOLIAN static Eina_Bool
166_elm_progressbar_elm_widget_sub_object_del(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, Evas_Object *sobj) 166_efl_ui_progressbar_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED, Evas_Object *sobj)
167{ 167{
168 Eina_Bool int_ret = EINA_FALSE; 168 Eina_Bool int_ret = EINA_FALSE;
169 int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); 169 int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
@@ -178,7 +178,7 @@ _elm_progressbar_elm_widget_sub_object_del(Eo *obj, Elm_Progressbar_Data *_pd EI
178 * spot is elm.swallow.content, not elm.swallow.icon. Fix that 178 * spot is elm.swallow.content, not elm.swallow.icon. Fix that
179 * whenever we can changed the theme API */ 179 * whenever we can changed the theme API */
180static Eina_Bool 180static Eina_Bool
181_elm_progressbar_content_set(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) 181_efl_ui_progressbar_content_set(Eo *obj, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
182{ 182{
183 Eina_Bool int_ret = EINA_FALSE; 183 Eina_Bool int_ret = EINA_FALSE;
184 int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content); 184 int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
@@ -190,7 +190,7 @@ _elm_progressbar_content_set(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, con
190} 190}
191 191
192EOLIAN static Elm_Theme_Apply 192EOLIAN static Elm_Theme_Apply
193_elm_progressbar_elm_widget_theme_apply(Eo *obj, Elm_Progressbar_Data *sd) 193_efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
194{ 194{
195 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 195 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
196 ELM_LAYOUT_DATA_GET(obj, ld); 196 ELM_LAYOUT_DATA_GET(obj, ld);
@@ -279,7 +279,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
279} 279}
280 280
281EOLIAN static void 281EOLIAN static void
282_elm_progressbar_efl_canvas_group_group_add(Eo *obj, Elm_Progressbar_Data *priv) 282_efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data *priv)
283{ 283{
284 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 284 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
285 285
@@ -318,9 +318,9 @@ _elm_progressbar_efl_canvas_group_group_add(Eo *obj, Elm_Progressbar_Data *priv)
318} 318}
319 319
320EOLIAN static void 320EOLIAN static void
321_elm_progressbar_efl_canvas_group_group_del(Eo *obj, Elm_Progressbar_Data *sd) 321_efl_ui_progressbar_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Progressbar_Data *sd)
322{ 322{
323 Elm_Progress_Status *progress_obj; 323 Efl_Ui_Progress_Status *progress_obj;
324 324
325 eina_stringshare_del(sd->units); 325 eina_stringshare_del(sd->units);
326 sd->units = NULL; 326 sd->units = NULL;
@@ -336,13 +336,13 @@ _elm_progressbar_efl_canvas_group_group_del(Eo *obj, Elm_Progressbar_Data *sd)
336} 336}
337 337
338EOLIAN static const Elm_Layout_Part_Alias_Description* 338EOLIAN static const Elm_Layout_Part_Alias_Description*
339_elm_progressbar_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *_pd EINA_UNUSED) 339_efl_ui_progressbar_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
340{ 340{
341 return _text_aliases; 341 return _text_aliases;
342} 342}
343 343
344EOLIAN static const Elm_Layout_Part_Alias_Description* 344EOLIAN static const Elm_Layout_Part_Alias_Description*
345_elm_progressbar_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *_pd EINA_UNUSED) 345_efl_ui_progressbar_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
346{ 346{
347 return _content_aliases; 347 return _content_aliases;
348} 348}
@@ -356,7 +356,7 @@ elm_progressbar_add(Evas_Object *parent)
356} 356}
357 357
358EOLIAN static Eo * 358EOLIAN static Eo *
359_elm_progressbar_efl_object_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED) 359_efl_ui_progressbar_efl_object_constructor(Eo *obj, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
360{ 360{
361 obj = efl_constructor(efl_super(obj, MY_CLASS)); 361 obj = efl_constructor(efl_super(obj, MY_CLASS));
362 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 362 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -367,7 +367,7 @@ _elm_progressbar_efl_object_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_
367} 367}
368 368
369EOLIAN static void 369EOLIAN static void
370_elm_progressbar_pulse_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, Eina_Bool pulse) 370_efl_ui_progressbar_pulse_set(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd, Eina_Bool pulse)
371{ 371{
372 pulse = !!pulse; 372 pulse = !!pulse;
373 if (sd->pulse == pulse) return; 373 if (sd->pulse == pulse) return;
@@ -378,13 +378,13 @@ _elm_progressbar_pulse_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, Eina_B
378} 378}
379 379
380EOLIAN static Eina_Bool 380EOLIAN static Eina_Bool
381_elm_progressbar_pulse_get(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd) 381_efl_ui_progressbar_pulse_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
382{ 382{
383 return sd->pulse; 383 return sd->pulse;
384} 384}
385 385
386EOLIAN static void 386EOLIAN static void
387_elm_progressbar_efl_orientation_orientation_set(Eo *obj, Elm_Progressbar_Data *sd, Efl_Orient dir) 387_efl_ui_progressbar_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Efl_Orient dir)
388{ 388{
389 sd->orientation = dir; 389 sd->orientation = dir;
390 390
@@ -392,13 +392,13 @@ _elm_progressbar_efl_orientation_orientation_set(Eo *obj, Elm_Progressbar_Data *
392} 392}
393 393
394EOLIAN static Efl_Orient 394EOLIAN static Efl_Orient
395_elm_progressbar_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd) 395_efl_ui_progressbar_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
396{ 396{
397 return sd->orientation; 397 return sd->orientation;
398} 398}
399 399
400EOLIAN static void 400EOLIAN static void
401_elm_progressbar_efl_ui_progress_span_size_set(Eo *obj, Elm_Progressbar_Data *sd, Evas_Coord size) 401_efl_ui_progressbar_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size)
402{ 402{
403 if (sd->size == size) return; 403 if (sd->size == size) return;
404 404
@@ -417,13 +417,13 @@ _elm_progressbar_efl_ui_progress_span_size_set(Eo *obj, Elm_Progressbar_Data *sd
417} 417}
418 418
419EOLIAN static Evas_Coord 419EOLIAN static Evas_Coord
420_elm_progressbar_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd) 420_efl_ui_progressbar_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
421{ 421{
422 return sd->size; 422 return sd->size;
423} 423}
424 424
425EOLIAN static void 425EOLIAN static void
426_elm_progressbar_efl_ui_progress_progress_value_set(Eo *obj, Elm_Progressbar_Data *sd, double val) 426_efl_ui_progressbar_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val)
427{ 427{
428 if (EINA_DBL_EQ(sd->val, val)) return; 428 if (EINA_DBL_EQ(sd->val, val)) return;
429 429
@@ -431,13 +431,13 @@ _elm_progressbar_efl_ui_progress_progress_value_set(Eo *obj, Elm_Progressbar_Dat
431} 431}
432 432
433EOLIAN static double 433EOLIAN static double
434_elm_progressbar_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd) 434_efl_ui_progressbar_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
435{ 435{
436 return sd->val; 436 return sd->val;
437} 437}
438 438
439EOLIAN static void 439EOLIAN static void
440_elm_progressbar_efl_ui_progress_unit_format_set(Eo *obj, Elm_Progressbar_Data *sd, const char *units) 440_efl_ui_progressbar_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *units)
441{ 441{
442 const char *sig; 442 const char *sig;
443 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 443 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -452,13 +452,13 @@ _elm_progressbar_efl_ui_progress_unit_format_set(Eo *obj, Elm_Progressbar_Data *
452} 452}
453 453
454EOLIAN static const char * 454EOLIAN static const char *
455_elm_progressbar_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd) 455_efl_ui_progressbar_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
456{ 456{
457 return sd->units; 457 return sd->units;
458} 458}
459 459
460EOLIAN static void 460EOLIAN static void
461_elm_progressbar_pulse(Eo *obj, Elm_Progressbar_Data *sd, Eina_Bool state) 461_efl_ui_progressbar_pulse(Eo *obj, Efl_Ui_Progressbar_Data *sd, Eina_Bool state)
462{ 462{
463 state = !!state; 463 state = !!state;
464 if ((!sd->pulse) || (sd->pulse_state == state)) return; 464 if ((!sd->pulse) || (sd->pulse_state == state)) return;
@@ -472,15 +472,15 @@ _elm_progressbar_pulse(Eo *obj, Elm_Progressbar_Data *sd, Eina_Bool state)
472} 472}
473 473
474EOLIAN static Eina_Bool 474EOLIAN static Eina_Bool
475_elm_progressbar_is_pulsing_get(const Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd) 475_efl_ui_progressbar_is_pulsing_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
476{ 476{
477 return (sd->pulse_state && sd->pulse); 477 return (sd->pulse_state && sd->pulse);
478} 478}
479 479
480EOLIAN static void 480EOLIAN static void
481_elm_progressbar_part_value_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, const char *part_name, double val) 481_efl_ui_progressbar_part_value_set(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd, const char *part_name, double val)
482{ 482{
483 Elm_Progress_Status *ps; 483 Efl_Ui_Progress_Status *ps;
484 Eina_Bool existing_ps = EINA_FALSE; 484 Eina_Bool existing_ps = EINA_FALSE;
485 Eina_List *l; 485 Eina_List *l;
486 486
@@ -510,13 +510,13 @@ _elm_progressbar_part_value_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, c
510 _val_set(obj); 510 _val_set(obj);
511 _units_set(obj); 511 _units_set(obj);
512 efl_event_callback_legacy_call 512 efl_event_callback_legacy_call
513 (obj, ELM_PROGRESSBAR_EVENT_CHANGED, NULL); 513 (obj, EFL_UI_PROGRESSBAR_EVENT_CHANGED, NULL);
514} 514}
515 515
516EOLIAN static double 516EOLIAN static double
517_elm_progressbar_part_value_get(const Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, const char* part) 517_efl_ui_progressbar_part_value_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd, const char* part)
518{ 518{
519 Elm_Progress_Status *ps; 519 Efl_Ui_Progress_Status *ps;
520 Eina_List *l; 520 Eina_List *l;
521 521
522 EINA_LIST_FOREACH(sd->progress_status, l, ps) 522 EINA_LIST_FOREACH(sd->progress_status, l, ps)
@@ -528,43 +528,43 @@ _elm_progressbar_part_value_get(const Eo *obj EINA_UNUSED, Elm_Progressbar_Data
528} 528}
529 529
530EAPI void 530EAPI void
531elm_progressbar_value_set(Elm_Progressbar *obj, double val) 531elm_progressbar_value_set(Evas_Object *obj, double val)
532{ 532{
533 efl_ui_progress_value_set(obj, val); 533 efl_ui_progress_value_set(obj, val);
534} 534}
535 535
536EAPI double 536EAPI double
537elm_progressbar_value_get(const Elm_Progressbar *obj) 537elm_progressbar_value_get(const Evas_Object *obj)
538{ 538{
539 return efl_ui_progress_value_get(obj); 539 return efl_ui_progress_value_get(obj);
540} 540}
541 541
542EAPI void 542EAPI void
543elm_progressbar_span_size_set(Elm_Progressbar *obj, Evas_Coord size) 543elm_progressbar_span_size_set(Evas_Object *obj, Evas_Coord size)
544{ 544{
545 efl_ui_progress_span_size_set(obj, size); 545 efl_ui_progress_span_size_set(obj, size);
546} 546}
547 547
548EAPI Evas_Coord 548EAPI Evas_Coord
549elm_progressbar_span_size_get(const Elm_Progressbar *obj) 549elm_progressbar_span_size_get(const Evas_Object *obj)
550{ 550{
551 return efl_ui_progress_span_size_get(obj); 551 return efl_ui_progress_span_size_get(obj);
552} 552}
553 553
554EAPI void 554EAPI void
555elm_progressbar_unit_format_set(Elm_Progressbar *obj, const char *units) 555elm_progressbar_unit_format_set(Evas_Object *obj, const char *units)
556{ 556{
557 efl_ui_progress_unit_format_set(obj, units); 557 efl_ui_progress_unit_format_set(obj, units);
558} 558}
559 559
560EAPI const char * 560EAPI const char *
561elm_progressbar_unit_format_get(const Elm_Progressbar *obj) 561elm_progressbar_unit_format_get(const Evas_Object *obj)
562{ 562{
563 return efl_ui_progress_unit_format_get(obj); 563 return efl_ui_progress_unit_format_get(obj);
564} 564}
565 565
566EAPI void 566EAPI void
567elm_progressbar_unit_format_function_set(Elm_Progressbar *obj, progressbar_func_type func, progressbar_freefunc_type free_func) 567elm_progressbar_unit_format_function_set(Evas_Object *obj, progressbar_func_type func, progressbar_freefunc_type free_func)
568{ 568{
569 const char *sig; 569 const char *sig;
570 ELM_PROGRESSBAR_DATA_GET(obj, sd); 570 ELM_PROGRESSBAR_DATA_GET(obj, sd);
@@ -600,7 +600,7 @@ _orientation_get(Eina_Bool horizontal, Eina_Bool inverted)
600} 600}
601 601
602EAPI void 602EAPI void
603elm_progressbar_horizontal_set(Elm_Progressbar *obj, Eina_Bool horizontal) 603elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
604{ 604{
605 Efl_Orient dir; 605 Efl_Orient dir;
606 ELM_PROGRESSBAR_DATA_GET(obj, sd); 606 ELM_PROGRESSBAR_DATA_GET(obj, sd);
@@ -611,7 +611,7 @@ elm_progressbar_horizontal_set(Elm_Progressbar *obj, Eina_Bool horizontal)
611} 611}
612 612
613EAPI Eina_Bool 613EAPI Eina_Bool
614elm_progressbar_horizontal_get(const Elm_Progressbar *obj) 614elm_progressbar_horizontal_get(const Evas_Object *obj)
615{ 615{
616 Efl_Orient dir; 616 Efl_Orient dir;
617 dir = efl_orientation_get(obj); 617 dir = efl_orientation_get(obj);
@@ -620,7 +620,7 @@ elm_progressbar_horizontal_get(const Elm_Progressbar *obj)
620} 620}
621 621
622EAPI void 622EAPI void
623elm_progressbar_inverted_set(Elm_Progressbar *obj, Eina_Bool inverted) 623elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted)
624{ 624{
625 Efl_Orient dir; 625 Efl_Orient dir;
626 ELM_PROGRESSBAR_DATA_GET(obj, sd); 626 ELM_PROGRESSBAR_DATA_GET(obj, sd);
@@ -631,7 +631,7 @@ elm_progressbar_inverted_set(Elm_Progressbar *obj, Eina_Bool inverted)
631} 631}
632 632
633EAPI Eina_Bool 633EAPI Eina_Bool
634elm_progressbar_inverted_get(const Elm_Progressbar *obj) 634elm_progressbar_inverted_get(const Evas_Object *obj)
635{ 635{
636 Efl_Orient dir; 636 Efl_Orient dir;
637 dir = efl_orientation_get(obj); 637 dir = efl_orientation_get(obj);
@@ -640,34 +640,34 @@ elm_progressbar_inverted_get(const Elm_Progressbar *obj)
640} 640}
641 641
642EOLIAN static Eina_Bool 642EOLIAN static Eina_Bool
643_elm_progressbar_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *_pd EINA_UNUSED) 643_efl_ui_progressbar_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
644{ 644{
645 return EINA_FALSE; 645 return EINA_FALSE;
646} 646}
647 647
648EOLIAN static Eina_Bool 648EOLIAN static Eina_Bool
649_elm_progressbar_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *_pd EINA_UNUSED) 649_efl_ui_progressbar_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
650{ 650{
651 return EINA_FALSE; 651 return EINA_FALSE;
652} 652}
653 653
654EOLIAN static void 654EOLIAN static void
655_elm_progressbar_class_constructor(Efl_Class *klass) 655_efl_ui_progressbar_class_constructor(Efl_Class *klass)
656{ 656{
657 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 657 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
658} 658}
659 659
660/* Efl.Part begin */ 660/* Efl.Part begin */
661 661
662ELM_PART_OVERRIDE(elm_progressbar, ELM_PROGRESSBAR, ELM_LAYOUT, Elm_Progressbar_Data, Elm_Part_Data) 662ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, ELM_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data)
663ELM_PART_OVERRIDE_CONTENT_SET(elm_progressbar, ELM_PROGRESSBAR, ELM_LAYOUT, Elm_Progressbar_Data, Elm_Part_Data) 663ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_progressbar, EFL_UI_PROGRESSBAR, ELM_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data)
664#include "elm_progressbar_internal_part.eo.c" 664#include "efl_ui_progressbar_internal_part.eo.c"
665 665
666/* Efl.Part end */ 666/* Efl.Part end */
667 667
668/* Internal EO APIs and hidden overrides */ 668/* Internal EO APIs and hidden overrides */
669 669
670#define ELM_PROGRESSBAR_EXTRA_OPS \ 670#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
671 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_progressbar) 671 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
672 672
673#include "elm_progressbar.eo.c" 673#include "efl_ui_progressbar.eo.c"
diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 7c3cf7e..f96c5fb 100644
--- a/src/lib/elementary/elm_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,10 +1,8 @@
1class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress, 1class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Progress,
2 Efl.Orientation) 2 Efl.Orientation)
3{ 3{
4 [[Elementary progressbar class]] 4 [[Elementary progressbar class]]
5 legacy_prefix: elm_progressbar; 5 legacy_prefix: elm_progressbar;
6 eo_prefix: elm_obj_progressbar;
7 event_prefix: elm_progressbar;
8 methods { 6 methods {
9 @property pulse { 7 @property pulse {
10 [[Control whether a given progress bar widget is at "pulsing mode" or not. 8 [[Control whether a given progress bar widget is at "pulsing mode" or not.
diff --git a/src/lib/elementary/efl_ui_progressbar_eo.h b/src/lib/elementary/efl_ui_progressbar_eo.h
new file mode 100644
index 0000000..6eeaf9c
--- /dev/null
+++ b/src/lib/elementary/efl_ui_progressbar_eo.h
@@ -0,0 +1 @@
#include "efl_ui_progressbar.eo.h"
diff --git a/src/lib/elementary/elm_progressbar_internal_part.eo b/src/lib/elementary/efl_ui_progressbar_internal_part.eo
index f7ab679..080ba5d 100644
--- a/src/lib/elementary/elm_progressbar_internal_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Progressbar.Internal.Part (Elm.Layout.Internal.Part) 1class Efl.Ui.Progressbar.Internal.Part (Elm.Layout.Internal.Part)
2{ 2{
3 [[Elementary progressbar internal part class]] 3 [[Elementary progressbar internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_widget_progressbar.h b/src/lib/elementary/efl_ui_progressbar_private.h
index 0ebec8a..2c9b345 100644
--- a/src/lib/elementary/elm_widget_progressbar.h
+++ b/src/lib/elementary/efl_ui_progressbar_private.h
@@ -1,5 +1,5 @@
1#ifndef ELM_WIDGET_PROGRESSBAR_H 1#ifndef EFL_UI_PROGRESSBAR_PRIVATE_H
2#define ELM_WIDGET_PROGRESSBAR_H 2#define EFL_UI_PROGRESSBAR_PRIVATE_H
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
@@ -23,10 +23,10 @@
23/** 23/**
24 * Base layout smart data extended with progressbar instance data. 24 * Base layout smart data extended with progressbar instance data.
25 */ 25 */
26typedef struct _Elm_Progressbar_Data Elm_Progressbar_Data; 26typedef struct _Efl_Ui_Progressbar_Data Efl_Ui_Progressbar_Data;
27typedef struct _Elm_Progress_Status Elm_Progress_Status; 27typedef struct _Efl_Ui_Progress_Status Efl_Ui_Progress_Status;
28 28
29struct _Elm_Progressbar_Data 29struct _Efl_Ui_Progressbar_Data
30{ 30{
31 Evas_Object *spacer; /**< The rect actual progressbar area, gets the progressbar size and gets the events */ 31 Evas_Object *spacer; /**< The rect actual progressbar area, gets the progressbar size and gets the events */
32 const char *units; /**< The units will be displayed on progressbar */ 32 const char *units; /**< The units will be displayed on progressbar */
@@ -43,7 +43,7 @@ struct _Elm_Progressbar_Data
43 void (*unit_format_free)(char *str); /**< The freeing function for the format string */ 43 void (*unit_format_free)(char *str); /**< The freeing function for the format string */
44}; 44};
45 45
46struct _Elm_Progress_Status 46struct _Efl_Ui_Progress_Status
47{ 47{
48 const char *part_name; 48 const char *part_name;
49 double val; 49 double val;
@@ -54,7 +54,7 @@ struct _Elm_Progress_Status
54 */ 54 */
55 55
56#define ELM_PROGRESSBAR_DATA_GET(o, sd) \ 56#define ELM_PROGRESSBAR_DATA_GET(o, sd) \
57 Elm_Progressbar_Data * sd = efl_data_scope_get(o, ELM_PROGRESSBAR_CLASS) 57 Efl_Ui_Progressbar_Data * sd = efl_data_scope_get(o, EFL_UI_PROGRESSBAR_CLASS)
58 58
59#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr) \ 59#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr) \
60 ELM_PROGRESSBAR_DATA_GET(o, ptr); \ 60 ELM_PROGRESSBAR_DATA_GET(o, ptr); \
@@ -75,7 +75,7 @@ struct _Elm_Progress_Status
75 } 75 }
76 76
77#define ELM_PROGRESSBAR_CHECK(obj) \ 77#define ELM_PROGRESSBAR_CHECK(obj) \
78 if (EINA_UNLIKELY(!efl_isa((obj), ELM_PROGRESSBAR_CLASS))) \ 78 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_PROGRESSBAR_CLASS))) \
79 return 79 return
80 80
81#endif 81#endif
diff --git a/src/lib/elementary/elm_progressbar.h b/src/lib/elementary/elm_progressbar.h
index 12cd9b3..7df3b3e 100644
--- a/src/lib/elementary/elm_progressbar.h
+++ b/src/lib/elementary/elm_progressbar.h
@@ -64,7 +64,7 @@
64 64
65#include "elm_progressbar_common.h" 65#include "elm_progressbar_common.h"
66#ifdef EFL_EO_API_SUPPORT 66#ifdef EFL_EO_API_SUPPORT
67#include "elm_progressbar_eo.h" 67#include "efl_ui_progressbar_eo.h"
68#endif 68#endif
69#ifndef EFL_NOLEGACY_API_SUPPORT 69#ifndef EFL_NOLEGACY_API_SUPPORT
70#include "elm_progressbar_legacy.h" 70#include "elm_progressbar_legacy.h"
diff --git a/src/lib/elementary/elm_progressbar_eo.h b/src/lib/elementary/elm_progressbar_eo.h
deleted file mode 100644
index 6ae7f19..0000000
--- a/src/lib/elementary/elm_progressbar_eo.h
+++ /dev/null
@@ -1 +0,0 @@
1#include "elm_progressbar.eo.h"
diff --git a/src/lib/elementary/elm_progressbar_legacy.h b/src/lib/elementary/elm_progressbar_legacy.h
index 7cec925..588173d 100644
--- a/src/lib/elementary/elm_progressbar_legacy.h
+++ b/src/lib/elementary/elm_progressbar_legacy.h
@@ -186,4 +186,4 @@ EAPI const char *elm_progressbar_unit_format_get(const Evas_Object *obj);
186 */ 186 */
187EAPI void elm_progressbar_unit_format_function_set(Evas_Object *obj, progressbar_func_type func, progressbar_freefunc_type free_func); 187EAPI void elm_progressbar_unit_format_function_set(Evas_Object *obj, progressbar_func_type func, progressbar_freefunc_type free_func);
188 188
189#include "elm_progressbar.eo.legacy.h" \ No newline at end of file 189#include "efl_ui_progressbar.eo.legacy.h" \ No newline at end of file