summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-09 16:13:06 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-09 17:08:24 +0900
commitdee61f40973071bab093f2f81109a7f2d5ff4097 (patch)
treedca04a67936902fbaadd4e3add4abeb928d1cc3a /src/lib
parentf60c2083a463d6e134b6fb34b5d640fe36c25ad9 (diff)
elm: Cleanup theme and style set functions
This makes efl_ui_layout_theme_set() return a Theme_Apply error code. The type is now public as Efl.Ui.Theme.Apply. Ref T5329 Ref T5363
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_button.c6
-rw-r--r--src/lib/elementary/efl_ui_check.c8
-rw-r--r--src/lib/elementary/efl_ui_clock.c6
-rw-r--r--src/lib/elementary/efl_ui_flip.c6
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/elementary/efl_ui_image.c6
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c6
-rw-r--r--src/lib/elementary/efl_ui_layout.c30
-rw-r--r--src/lib/elementary/efl_ui_layout.eo20
-rw-r--r--src/lib/elementary/efl_ui_nstate.c6
-rw-r--r--src/lib/elementary/efl_ui_panes.c6
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c8
-rw-r--r--src/lib/elementary/efl_ui_radio.c8
-rw-r--r--src/lib/elementary/efl_ui_slider.c8
-rw-r--r--src/lib/elementary/efl_ui_text.c8
-rw-r--r--src/lib/elementary/efl_ui_win.c18
-rw-r--r--src/lib/elementary/elc_combobox.c8
-rw-r--r--src/lib/elementary/elc_ctxpopup.c6
-rw-r--r--src/lib/elementary/elc_fileselector.c6
-rw-r--r--src/lib/elementary/elc_fileselector_button.c8
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c8
-rw-r--r--src/lib/elementary/elc_hoversel.c8
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c6
-rw-r--r--src/lib/elementary/elc_naviframe.c4
-rw-r--r--src/lib/elementary/elc_player.c6
-rw-r--r--src/lib/elementary/elc_popup.c4
-rw-r--r--src/lib/elementary/elm_actionslider.c8
-rw-r--r--src/lib/elementary/elm_box.c8
-rw-r--r--src/lib/elementary/elm_calendar.c6
-rw-r--r--src/lib/elementary/elm_clock.c6
-rw-r--r--src/lib/elementary/elm_colorselector.c8
-rw-r--r--src/lib/elementary/elm_conform.c6
-rw-r--r--src/lib/elementary/elm_dayselector.c6
-rw-r--r--src/lib/elementary/elm_diskselector.c6
-rw-r--r--src/lib/elementary/elm_entry.c10
-rw-r--r--src/lib/elementary/elm_flipselector.c8
-rw-r--r--src/lib/elementary/elm_general.eot14
-rw-r--r--src/lib/elementary/elm_gengrid.c10
-rw-r--r--src/lib/elementary/elm_genlist.c10
-rw-r--r--src/lib/elementary/elm_grid.c6
-rw-r--r--src/lib/elementary/elm_hover.c6
-rw-r--r--src/lib/elementary/elm_icon.c6
-rw-r--r--src/lib/elementary/elm_index.c6
-rw-r--r--src/lib/elementary/elm_label.c8
-rw-r--r--src/lib/elementary/elm_layout_legacy.h17
-rw-r--r--src/lib/elementary/elm_list.c6
-rw-r--r--src/lib/elementary/elm_map.c8
-rw-r--r--src/lib/elementary/elm_mapbuf.c6
-rw-r--r--src/lib/elementary/elm_menu.c6
-rw-r--r--src/lib/elementary/elm_notify.c8
-rw-r--r--src/lib/elementary/elm_panel.c8
-rw-r--r--src/lib/elementary/elm_photo.c6
-rw-r--r--src/lib/elementary/elm_plug.c6
-rw-r--r--src/lib/elementary/elm_priv.h4
-rw-r--r--src/lib/elementary/elm_route.c6
-rw-r--r--src/lib/elementary/elm_scroller.c6
-rw-r--r--src/lib/elementary/elm_segment_control.c6
-rw-r--r--src/lib/elementary/elm_separator.c6
-rw-r--r--src/lib/elementary/elm_spinner.c6
-rw-r--r--src/lib/elementary/elm_table.c6
-rw-r--r--src/lib/elementary/elm_theme.c12
-rw-r--r--src/lib/elementary/elm_toolbar.c10
-rw-r--r--src/lib/elementary/elm_widget.c22
-rw-r--r--src/lib/elementary/elm_widget.eo49
-rw-r--r--src/lib/elementary/elm_widget.h6
65 files changed, 309 insertions, 259 deletions
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index f19d840..01b978e 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -120,13 +120,13 @@ _icon_signal_emit(Evas_Object *obj)
120/* FIXME: replicated from elm_layout just because button's icon spot 120/* FIXME: replicated from elm_layout just because button's icon spot
121 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 121 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
122 * can changed the theme API */ 122 * can changed the theme API */
123EOLIAN static Elm_Theme_Apply 123EOLIAN static Efl_Ui_Theme_Apply
124_efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED) 124_efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
125{ 125{
126 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 126 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
127 127
128 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 128 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
129 if (!int_ret) return ELM_THEME_APPLY_FAILED; 129 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
130 _icon_signal_emit(obj); 130 _icon_signal_emit(obj);
131 131
132 return int_ret; 132 return int_ret;
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 193f1b1..15d0252 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -165,16 +165,16 @@ _efl_ui_check_elm_widget_widget_event(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSE
165 return EINA_TRUE; 165 return EINA_TRUE;
166} 166}
167 167
168EOLIAN static Elm_Theme_Apply 168EOLIAN static Efl_Ui_Theme_Apply
169_efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) 169_efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
170{ 170{
171 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 171 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
172 172
173 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 173 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
174 174
175 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 175 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
176 176
177 if (!int_ret) return ELM_THEME_APPLY_FAILED; 177 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
178 178
179 if (efl_ui_nstate_value_get(obj) == 0) 179 if (efl_ui_nstate_value_get(obj) == 0)
180 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 180 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 98bd90b..d936332 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -559,10 +559,10 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd)
559 evas_object_size_hint_max_set(obj, -1, -1); 559 evas_object_size_hint_max_set(obj, -1, -1);
560} 560}
561 561
562EOLIAN static Elm_Theme_Apply 562EOLIAN static Efl_Ui_Theme_Apply
563_efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) 563_efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
564{ 564{
565 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 565 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
566 566
567 Clock_Field *field; 567 Clock_Field *field;
568 char buf[BUFFER_SIZE]; 568 char buf[BUFFER_SIZE];
@@ -571,7 +571,7 @@ _efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
571 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 571 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
572 572
573 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 573 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
574 if (!int_ret) return ELM_THEME_APPLY_FAILED; 574 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
575 575
576 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE; 576 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE;
577 577
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index e557299..eb737b8 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -97,12 +97,12 @@ _sizing_eval(Evas_Object *obj)
97 evas_object_size_hint_max_set(obj, maxw, maxh); 97 evas_object_size_hint_max_set(obj, maxw, maxh);
98} 98}
99 99
100EOLIAN static Elm_Theme_Apply 100EOLIAN static Efl_Ui_Theme_Apply
101_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) 101_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
102{ 102{
103 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 103 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
104 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (!int_ret) return ELM_THEME_APPLY_FAILED; 105 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
106 106
107 _sizing_eval(obj); 107 _sizing_eval(obj);
108 108
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 131d9dd..181db54 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -112,12 +112,12 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
112 evas_object_table_mirrored_set(wd->resize_obj, rtl); 112 evas_object_table_mirrored_set(wd->resize_obj, rtl);
113} 113}
114 114
115EOLIAN static Elm_Theme_Apply 115EOLIAN static Efl_Ui_Theme_Apply
116_efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) 116_efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
117{ 117{
118 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 118 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
119 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 119 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
120 if (!int_ret) return ELM_THEME_APPLY_FAILED; 120 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
121 121
122 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 122 _mirrored_set(obj, efl_ui_mirrored_get(obj));
123 123
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 320b782..9de0806 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -705,16 +705,16 @@ _efl_ui_image_efl_canvas_object_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Ob
705 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip); 705 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
706} 706}
707 707
708EOLIAN static Elm_Theme_Apply 708EOLIAN static Efl_Ui_Theme_Apply
709_efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) 709_efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
710{ 710{
711 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 711 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
712 712
713 if (sd->stdicon) 713 if (sd->stdicon)
714 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 714 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
715 715
716 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 716 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
717 if (!int_ret) return ELM_THEME_APPLY_FAILED; 717 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
718 718
719 _efl_ui_image_sizing_eval(obj); 719 _efl_ui_image_sizing_eval(obj);
720 720
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 707d71e..e01fbd2 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -885,17 +885,17 @@ _efl_ui_image_zoomable_elm_widget_on_focus(Eo *obj, Efl_Ui_Image_Zoomable_Data *
885 return EINA_TRUE; 885 return EINA_TRUE;
886} 886}
887 887
888EOLIAN static Elm_Theme_Apply 888EOLIAN static Efl_Ui_Theme_Apply
889_efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED) 889_efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED)
890{ 890{
891 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 891 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
892 Eina_Bool fdo = EINA_FALSE; 892 Eina_Bool fdo = EINA_FALSE;
893 893
894 if (sd->stdicon) 894 if (sd->stdicon)
895 _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE); 895 _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE);
896 896
897 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 897 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
898 if (!int_ret) return ELM_THEME_APPLY_FAILED; 898 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
899 899
900 _sizing_eval(obj); 900 _sizing_eval(obj);
901 901
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 934c86d..ce6a49d 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -349,12 +349,12 @@ _efl_ui_layout_elm_widget_disable(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
349 return EINA_TRUE; 349 return EINA_TRUE;
350} 350}
351 351
352static Elm_Theme_Apply 352static Efl_Ui_Theme_Apply
353_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) 353_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
354{ 354{
355 Elm_Theme_Apply ret = ELM_THEME_APPLY_FAILED; 355 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED;
356 356
357 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 357 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
358 358
359 /* function already prints error messages, if any */ 359 /* function already prints error messages, if any */
360 if (!sd->file_set) 360 if (!sd->file_set)
@@ -368,18 +368,18 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
368 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); 368 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
369 369
370 if (!_visuals_refresh(obj, sd)) 370 if (!_visuals_refresh(obj, sd))
371 ret = ELM_THEME_APPLY_FAILED; 371 ret = EFL_UI_THEME_APPLY_FAILED;
372 372
373 return ret; 373 return ret;
374} 374}
375 375
376EOLIAN static Elm_Theme_Apply 376EOLIAN static Efl_Ui_Theme_Apply
377_efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) 377_efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
378{ 378{
379 Elm_Theme_Apply theme_apply = ELM_THEME_APPLY_FAILED; 379 Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED;
380 380
381 theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 381 theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
382 if (!theme_apply) return ELM_THEME_APPLY_FAILED; 382 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
383 383
384 theme_apply &= _efl_ui_layout_theme_internal(obj, sd); 384 theme_apply &= _efl_ui_layout_theme_internal(obj, sd);
385 return theme_apply; 385 return theme_apply;
@@ -895,7 +895,7 @@ _efl_ui_layout_efl_file_mmap_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, co
895 efl_file_mmap_get(wd->resize_obj, file, group); 895 efl_file_mmap_get(wd->resize_obj, file, group);
896} 896}
897 897
898EOLIAN static Eina_Bool 898EOLIAN static Efl_Ui_Theme_Apply
899_efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style) 899_efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style)
900{ 900{
901 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 901 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -905,10 +905,7 @@ _efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, con
905 eina_stringshare_replace(&(sd->group), group); 905 eina_stringshare_replace(&(sd->group), group);
906 eina_stringshare_replace(&(wd->style), style); 906 eina_stringshare_replace(&(wd->style), style);
907 907
908 if (_efl_ui_layout_theme_internal(obj, sd)) 908 return _efl_ui_layout_theme_internal(obj, sd);
909 return EINA_TRUE;
910 else
911 return EINA_FALSE;
912} 909}
913 910
914EOLIAN static void 911EOLIAN static void
@@ -2483,6 +2480,15 @@ elm_layout_data_get(const Evas_Object *obj, const char *key)
2483 return efl_canvas_layout_group_data_get(obj, key); 2480 return efl_canvas_layout_group_data_get(obj, key);
2484} 2481}
2485 2482
2483EAPI Eina_Bool
2484elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style)
2485{
2486 Efl_Ui_Theme_Apply ta;
2487
2488 ta = efl_ui_layout_theme_set(obj, klass, group, style);
2489 return (ta != EFL_UI_THEME_APPLY_FAILED);
2490}
2491
2486/* End of legacy only */ 2492/* End of legacy only */
2487 2493
2488 2494
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 22c65fc..7c65199 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -4,7 +4,6 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
4 Efl.Canvas.Layout_Group) 4 Efl.Canvas.Layout_Group)
5{ 5{
6 [[Elementary layout class]] 6 [[Elementary layout class]]
7 legacy_prefix: elm_layout;
8 methods { 7 methods {
9 @property theme { 8 @property theme {
10 [[The theme of this widget, defines which edje group will be used. 9 [[The theme of this widget, defines which edje group will be used.
@@ -19,20 +18,27 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
19 ]] 18 ]]
20 set { 19 set {
21 [[Sets the edje group from the elementary theme that will be used 20 [[Sets the edje group from the elementary theme that will be used
22 as layout. 21 as layout. Note that $style will be the new style of this object,
23 22 as in an @Elm.Widget.style. As a consequence this function can
24 Note that $style will be the new style of this object, as in an 23 only be called during construction of the object, before finalize.
25 @Elm.Widget.style.
26 24
27 If this returns $false the widget is very likely to become 25 If this returns $false the widget is very likely to become
28 non-functioning. 26 non-functioning.
29 ]] 27 ]]
30 return: bool; [[$true on success, $false otherwise]] 28 return: Efl.Ui.Theme.Apply(0);
29 [[Whether the style was successfully applied or not, see
30 the values of @Efl.Ui.Theme.Apply for more information.]]
31 }
32 /*
33 TODO:
34 get {
35 [[Get information about the current theme in use.]]
31 } 36 }
37 */
32 values { 38 values {
33 klass: string; [[The class of the group, eg. "button".]] 39 klass: string; [[The class of the group, eg. "button".]]
34 group: string("base"); [[The group, eg. "base".]] 40 group: string("base"); [[The group, eg. "base".]]
35 style: string("default"); [[The style to used, eg "default".]] 41 style: string("default"); [[The style to use, eg "default".]]
36 } 42 }
37 } 43 }
38 } 44 }
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 3f9b6c3..8fe122e 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -138,13 +138,13 @@ _efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Nstate_Data *pd, int state)
138 _state_active(obj, pd); 138 _state_active(obj, pd);
139} 139}
140 140
141EOLIAN static Elm_Theme_Apply 141EOLIAN static Efl_Ui_Theme_Apply
142_efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) 142_efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
143{ 143{
144 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 144 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
145 145
146 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 146 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
147 if (!int_ret) return ELM_THEME_APPLY_FAILED; 147 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
148 148
149 _state_active(obj, pd); 149 _state_active(obj, pd);
150 150
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index dac9cb5..869b94c 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -44,13 +44,13 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
44 {NULL, NULL} 44 {NULL, NULL}
45}; 45};
46 46
47EOLIAN static Elm_Theme_Apply 47EOLIAN static Efl_Ui_Theme_Apply
48_efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) 48_efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
49{ 49{
50 double size; 50 double size;
51 Evas_Coord minw = 0, minh = 0; 51 Evas_Coord minw = 0, minh = 0;
52 52
53 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 53 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
54 EFL_UI_LAYOUT_DATA_GET(obj, ld); 54 EFL_UI_LAYOUT_DATA_GET(obj, ld);
55 55
56 if (sd->orientation == EFL_ORIENT_HORIZONTAL) 56 if (sd->orientation == EFL_ORIENT_HORIZONTAL)
@@ -63,7 +63,7 @@ _efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
63 evas_object_size_hint_min_set(sd->event, minw, minh); 63 evas_object_size_hint_min_set(sd->event, minw, minh);
64 64
65 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 65 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
66 if (!int_ret) return ELM_THEME_APPLY_FAILED; 66 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
67 67
68 size = elm_panes_content_left_size_get(obj); 68 size = elm_panes_content_left_size_get(obj);
69 69
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 383ef1a..d732763 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -190,19 +190,19 @@ _efl_ui_progressbar_content_set(Eo *obj, Efl_Ui_Progressbar_Data *_pd EINA_UNUSE
190 return EINA_TRUE; 190 return EINA_TRUE;
191} 191}
192 192
193EOLIAN static Elm_Theme_Apply 193EOLIAN static Efl_Ui_Theme_Apply
194_efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) 194_efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
195{ 195{
196 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 196 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
197 EFL_UI_LAYOUT_DATA_GET(obj, ld); 197 EFL_UI_LAYOUT_DATA_GET(obj, ld);
198 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 198 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
199 199
200 if (_is_horizontal(sd->orientation)) 200 if (_is_horizontal(sd->orientation))
201 eina_stringshare_replace(&ld->group, "horizontal"); 201 eina_stringshare_replace(&ld->group, "horizontal");
202 else eina_stringshare_replace(&ld->group, "vertical"); 202 else eina_stringshare_replace(&ld->group, "vertical");
203 203
204 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 204 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
205 if (!int_ret) return ELM_THEME_APPLY_FAILED; 205 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
206 206
207 if (sd->pulse) 207 if (sd->pulse)
208 elm_layout_signal_emit(obj, "elm,state,pulse", "elm"); 208 elm_layout_signal_emit(obj, "elm,state,pulse", "elm");
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 464059d..ef5d4af 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -162,13 +162,13 @@ _icon_signal_emit(Evas_Object *obj)
162 edje_object_message_signal_process(wd->resize_obj); 162 edje_object_message_signal_process(wd->resize_obj);
163} 163}
164 164
165EOLIAN static Elm_Theme_Apply 165EOLIAN static Efl_Ui_Theme_Apply
166_efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) 166_efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
167{ 167{
168 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 168 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
169 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 169 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
170 int_ret = elm_obj_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); 170 int_ret = elm_obj_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
171 if (!int_ret) return ELM_THEME_APPLY_FAILED; 171 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
172 172
173 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); 173 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
174 else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm"); 174 else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 3745f2d..9b32a1b 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -743,12 +743,12 @@ _popup_add(Efl_Ui_Slider_Data *sd, Eo *obj, Evas_Object **popup,
743 } 743 }
744} 744}
745 745
746EOLIAN static Elm_Theme_Apply 746EOLIAN static Efl_Ui_Theme_Apply
747_efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) 747_efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
748{ 748{
749 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 749 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
750 EFL_UI_LAYOUT_DATA_GET(obj, ld); 750 EFL_UI_LAYOUT_DATA_GET(obj, ld);
751 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 751 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
752 752
753 if (_is_horizontal(sd->orientation)) 753 if (_is_horizontal(sd->orientation))
754 { 754 {
@@ -783,7 +783,7 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
783 } 783 }
784 784
785 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 785 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
786 if (!int_ret) return ELM_THEME_APPLY_FAILED; 786 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
787 787
788 if (sd->popup) 788 if (sd->popup)
789 { 789 {
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 6d04306..147509d 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -907,19 +907,19 @@ _efl_ui_text_background_switch(Evas_Object *from_edje, Evas_Object *to_edje)
907 907
908/* we can't issue the layout's theming code here, cause it assumes an 908/* we can't issue the layout's theming code here, cause it assumes an
909 * unique edje object, always */ 909 * unique edje object, always */
910EOLIAN static Elm_Theme_Apply 910EOLIAN static Efl_Ui_Theme_Apply
911_efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) 911_efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
912{ 912{
913 const char *str; 913 const char *str;
914 const char *style = elm_widget_style_get(obj); 914 const char *style = elm_widget_style_get(obj);
915 Elm_Theme_Apply theme_apply; 915 Efl_Ui_Theme_Apply theme_apply;
916 916
917 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 917 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
918 918
919 // Note: We are skipping elm_layout here! This is by design. 919 // Note: We are skipping elm_layout here! This is by design.
920 // This assumes the following inheritance: my_class -> layout -> widget ... 920 // This assumes the following inheritance: my_class -> layout -> widget ...
921 theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); 921 theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
922 if (!theme_apply) return ELM_THEME_APPLY_FAILED; 922 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
923 923
924 evas_event_freeze(evas_object_evas_get(obj)); 924 evas_event_freeze(evas_object_evas_get(obj));
925 925
@@ -986,7 +986,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
986 986
987 if (sd->scroll) 987 if (sd->scroll)
988 { 988 {
989 Elm_Theme_Apply ok = ELM_THEME_APPLY_FAILED; 989 Efl_Ui_Theme_Apply ok = EFL_UI_THEME_APPLY_FAILED;
990 990
991 elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj)); 991 elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj));
992 992
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2019f78..96f27cc 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -346,7 +346,7 @@ _elm_win_on_resize_obj_changed_size_hints(void *data,
346 void *event_info); 346 void *event_info);
347static void 347static void
348_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj); 348_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj);
349static Elm_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); 349static Efl_Ui_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd);
350static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style); 350static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style);
351static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc); 351static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc);
352static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine); 352static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine);
@@ -6286,16 +6286,16 @@ _efl_ui_win_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd
6286 return sd->focus_highlight.enabled; 6286 return sd->focus_highlight.enabled;
6287} 6287}
6288 6288
6289static Elm_Theme_Apply 6289static Efl_Ui_Theme_Apply
6290_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) 6290_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6291{ 6291{
6292 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 6292 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
6293 Eina_Bool ret = EINA_FALSE, prev_alpha; 6293 Eina_Bool ret = EINA_FALSE, prev_alpha;
6294 const char *s; 6294 const char *s;
6295 6295
6296 int_ret = _elm_theme_object_set(obj, sd->legacy.edje, "win", "base", 6296 int_ret = _elm_theme_object_set(obj, sd->legacy.edje, "win", "base",
6297 elm_widget_style_get(obj)); 6297 elm_widget_style_get(obj));
6298 if (!int_ret) return ELM_THEME_APPLY_FAILED; 6298 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6299 6299
6300 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj)); 6300 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj));
6301 edje_object_scale_set(sd->legacy.edje, 6301 edje_object_scale_set(sd->legacy.edje,
@@ -6304,7 +6304,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6304 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); 6304 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
6305 ret = elm_obj_widget_disable(obj); 6305 ret = elm_obj_widget_disable(obj);
6306 6306
6307 if (!ret) int_ret = ELM_THEME_APPLY_FAILED; 6307 if (!ret) int_ret = EFL_UI_THEME_APPLY_FAILED;
6308 6308
6309 prev_alpha = sd->theme_alpha; 6309 prev_alpha = sd->theme_alpha;
6310 s = edje_object_data_get(sd->legacy.edje, "alpha"); 6310 s = edje_object_data_get(sd->legacy.edje, "alpha");
@@ -6315,17 +6315,17 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6315 return int_ret; 6315 return int_ret;
6316} 6316}
6317 6317
6318EOLIAN static Elm_Theme_Apply 6318EOLIAN static Efl_Ui_Theme_Apply
6319_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) 6319_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
6320{ 6320{
6321 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 6321 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
6322 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 6322 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
6323 if (!int_ret) return ELM_THEME_APPLY_FAILED; 6323 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6324 6324
6325 sd->focus_highlight.theme_changed = EINA_TRUE; 6325 sd->focus_highlight.theme_changed = EINA_TRUE;
6326 6326
6327 int_ret = _elm_win_theme_internal(obj, sd) & int_ret; 6327 int_ret = _elm_win_theme_internal(obj, sd) & int_ret;
6328 if (!int_ret) return ELM_THEME_APPLY_FAILED; 6328 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6329 _elm_win_focus_highlight_reconfigure_job_start(sd); 6329 _elm_win_focus_highlight_reconfigure_job_start(sd);
6330 6330
6331 return int_ret; 6331 return int_ret;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 0704f0d..bd745c7 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -56,15 +56,15 @@ _elm_combobox_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd)
56 return EINA_TRUE; 56 return EINA_TRUE;
57} 57}
58 58
59EOLIAN static Elm_Theme_Apply 59EOLIAN static Efl_Ui_Theme_Apply
60_elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) 60_elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
61{ 61{
62 const char *style; 62 const char *style;
63 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 63 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
64 Eina_Bool mirrored; 64 Eina_Bool mirrored;
65 char buf[128]; 65 char buf[128];
66 66
67 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 67 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
68 68
69 style = eina_stringshare_add(elm_widget_style_get(obj)); 69 style = eina_stringshare_add(elm_widget_style_get(obj));
70 70
@@ -74,7 +74,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
74 eina_stringshare_replace(&(wd->style), buf); 74 eina_stringshare_replace(&(wd->style), buf);
75 75
76 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 76 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
77 if (!int_ret) return ELM_THEME_APPLY_FAILED; 77 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
78 78
79 eina_stringshare_replace(&(wd->style), style); 79 eina_stringshare_replace(&(wd->style), style);
80 80
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 8eb858a..1a20710 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -746,13 +746,13 @@ _on_content_resized(void *data,
746} 746}
747 747
748//FIXME: lost the content size when theme hook is called. 748//FIXME: lost the content size when theme hook is called.
749EOLIAN static Elm_Theme_Apply 749EOLIAN static Efl_Ui_Theme_Apply
750_elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) 750_elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
751{ 751{
752 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 752 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
753 753
754 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 754 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
755 if (!int_ret) return ELM_THEME_APPLY_FAILED; 755 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
756 756
757 elm_widget_theme_object_set 757 elm_widget_theme_object_set
758 (obj, sd->bg, "ctxpopup", "bg", elm_widget_style_get(obj)); 758 (obj, sd->bg, "ctxpopup", "bg", elm_widget_style_get(obj));
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 25293ad..7ecadc6 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -227,16 +227,16 @@ _model_str_property_set(Efl_Model *model, const char *property_name, const char
227 return r; 227 return r;
228} 228}
229 229
230EOLIAN static Elm_Theme_Apply 230EOLIAN static Efl_Ui_Theme_Apply
231_elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) 231_elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
232{ 232{
233 const char *style; 233 const char *style;
234 const char *data; 234 const char *data;
235 char buf[1024]; 235 char buf[1024];
236 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 236 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
237 237
238 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 238 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
239 if (!int_ret) return ELM_THEME_APPLY_FAILED; 239 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
240 240
241 style = elm_widget_style_get(obj); 241 style = elm_widget_style_get(obj);
242 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 242 _mirrored_set(obj, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 3ee7116..1c67012 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -42,15 +42,15 @@ _model_free_eo_cb(void *eo)
42 efl_unref(eo); 42 efl_unref(eo);
43} 43}
44 44
45EOLIAN static Elm_Theme_Apply 45EOLIAN static Efl_Ui_Theme_Apply
46_elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) 46_elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED)
47{ 47{
48 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 48 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
49 49
50 char buf[4096]; 50 char buf[4096];
51 const char *style; 51 const char *style;
52 52
53 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 53 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
54 54
55 style = eina_stringshare_add(elm_widget_style_get(obj)); 55 style = eina_stringshare_add(elm_widget_style_get(obj));
56 56
@@ -60,7 +60,7 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button
60 eina_stringshare_replace(&(wd->style), buf); 60 eina_stringshare_replace(&(wd->style), buf);
61 61
62 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 62 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
63 if (!int_ret) return ELM_THEME_APPLY_FAILED; 63 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
64 64
65 eina_stringshare_replace(&(wd->style), style); 65 eina_stringshare_replace(&(wd->style), style);
66 66
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 12b024e..b75e7af 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -207,17 +207,17 @@ _elm_fileselector_entry_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Fileselec
207 return EINA_FALSE; 207 return EINA_FALSE;
208} 208}
209 209
210EOLIAN static Elm_Theme_Apply 210EOLIAN static Efl_Ui_Theme_Apply
211_elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) 211_elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd)
212{ 212{
213 const char *style; 213 const char *style;
214 char buf[1024]; 214 char buf[1024];
215 215
216 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 216 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
217 217
218 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 218 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
219 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 219 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
220 if (!int_ret) return ELM_THEME_APPLY_FAILED; 220 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
221 221
222 style = elm_widget_style_get(obj); 222 style = elm_widget_style_get(obj);
223 223
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 647ae14..4ea9679 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -62,14 +62,14 @@ _elm_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
62 return EINA_TRUE; 62 return EINA_TRUE;
63} 63}
64 64
65EOLIAN static Elm_Theme_Apply 65EOLIAN static Efl_Ui_Theme_Apply
66_elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) 66_elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
67{ 67{
68 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 68 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
69 Eina_List *l; 69 Eina_List *l;
70 Elm_Object_Item *eo_item; 70 Elm_Object_Item *eo_item;
71 71
72 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 72 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
73 73
74 char buf[4096]; 74 char buf[4096];
75 const char *style; 75 const char *style;
@@ -85,7 +85,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
85 eina_stringshare_replace(&(wd->style), buf); 85 eina_stringshare_replace(&(wd->style), buf);
86 86
87 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 87 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
88 if (!int_ret) return ELM_THEME_APPLY_FAILED; 88 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
89 89
90 eina_stringshare_replace(&(wd->style), style); 90 eina_stringshare_replace(&(wd->style), style);
91 91
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 0547901..edcb604 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -86,7 +86,7 @@ _format_count(int count, void *data EINA_UNUSED)
86 return strdup(buf); 86 return strdup(buf);
87} 87}
88 88
89EOLIAN static Elm_Theme_Apply 89EOLIAN static Efl_Ui_Theme_Apply
90_elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd) 90_elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd)
91{ 91{
92 const char *str; 92 const char *str;
@@ -95,9 +95,9 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data
95 Elm_Object_Item *eo_item; 95 Elm_Object_Item *eo_item;
96 double pad_scale; 96 double pad_scale;
97 97
98 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 98 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
99 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 99 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
100 if (!int_ret) return ELM_THEME_APPLY_FAILED; 100 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
101 101
102 str = elm_layout_data_get(obj, "horizontal_pad"); 102 str = elm_layout_data_get(obj, "horizontal_pad");
103 if (str) hpad = atoi(str); 103 if (str) hpad = atoi(str);
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 0453fe0..42f5a40 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -394,7 +394,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, Eina_Bool transition)
394 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit))); 394 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit)));
395} 395}
396 396
397EOLIAN static Elm_Theme_Apply 397EOLIAN static Efl_Ui_Theme_Apply
398_elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) 398_elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
399{ 399{
400 Elm_Naviframe_Item_Data *it; 400 Elm_Naviframe_Item_Data *it;
@@ -412,7 +412,7 @@ _elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
412 } 412 }
413 413
414 elm_layout_sizing_eval(obj); 414 elm_layout_sizing_eval(obj);
415 return ELM_THEME_APPLY_SUCCESS; 415 return EFL_UI_THEME_APPLY_SUCCESS;
416} 416}
417 417
418static char * 418static char *
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 1e96b58..d5f621c 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -199,12 +199,12 @@ _update_theme_slider(Evas_Object *obj, Evas_Object *sl, const char *name, const
199 elm_object_disabled_set(sl, elm_widget_disabled_get(obj)); 199 elm_object_disabled_set(sl, elm_widget_disabled_get(obj));
200} 200}
201 201
202EOLIAN static Elm_Theme_Apply 202EOLIAN static Efl_Ui_Theme_Apply
203_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) 203_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
204{ 204{
205 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 205 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
206 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 206 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
207 if (!int_ret) return ELM_THEME_APPLY_FAILED; 207 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
208 208
209 _update_theme_button(obj, sd->forward, "forward"); 209 _update_theme_button(obj, sd->forward, "forward");
210 _update_theme_button(obj, sd->info, "info"); 210 _update_theme_button(obj, sd->info, "info");
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index b404567..a5d3b78 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -355,7 +355,7 @@ _populate_theme_scroll(Elm_Popup_Data *sd)
355 sd->theme_scroll = EINA_FALSE; 355 sd->theme_scroll = EINA_FALSE;
356} 356}
357 357
358EOLIAN static Elm_Theme_Apply 358EOLIAN static Efl_Ui_Theme_Apply
359_elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) 359_elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
360{ 360{
361 Elm_Popup_Item_Data *it; 361 Elm_Popup_Item_Data *it;
@@ -429,7 +429,7 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
429 /* access */ 429 /* access */
430 if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE); 430 if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE);
431 431
432 return ELM_THEME_APPLY_SUCCESS; 432 return EFL_UI_THEME_APPLY_SUCCESS;
433} 433}
434 434
435static void 435static void
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 213f338..0c4a5f4 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -112,18 +112,18 @@ _mirroredness_change_eval(Evas_Object *obj)
112 (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5); 112 (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5);
113} 113}
114 114
115EOLIAN static Elm_Theme_Apply 115EOLIAN static Efl_Ui_Theme_Apply
116_elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) 116_elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED)
117{ 117{
118 Eina_Bool mirrored; 118 Eina_Bool mirrored;
119 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 119 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
120 120
121 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 121 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
122 122
123 mirrored = elm_object_mirrored_get(obj); 123 mirrored = elm_object_mirrored_get(obj);
124 124
125 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 125 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
126 if (!int_ret) return ELM_THEME_APPLY_FAILED; 126 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
127 127
128 if (elm_object_mirrored_get(obj) != mirrored) 128 if (elm_object_mirrored_get(obj) != mirrored)
129 _mirroredness_change_eval(obj); 129 _mirroredness_change_eval(obj);
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 0a5d2ac..9f8cc47 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -114,15 +114,15 @@ _elm_box_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Box_Data *_pd EINA_
114 (obj, base, items, list_data_get, degree, direction, direction_item, weight); 114 (obj, base, items, list_data_get, degree, direction, direction_item, weight);
115} 115}
116 116
117EOLIAN static Elm_Theme_Apply 117EOLIAN static Efl_Ui_Theme_Apply
118_elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) 118_elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
119{ 119{
120 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 120 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
121 121
122 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 122 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
123 if (!int_ret) return ELM_THEME_APPLY_FAILED; 123 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
124 124
125 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 125 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
126 evas_object_smart_calculate(wd->resize_obj); 126 evas_object_smart_calculate(wd->resize_obj);
127 127
128 return int_ret; 128 return int_ret;
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index ecab313..f75e182 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -876,13 +876,13 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
876 } 876 }
877} 877}
878 878
879EOLIAN static Elm_Theme_Apply 879EOLIAN static Efl_Ui_Theme_Apply
880_elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd) 880_elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
881{ 881{
882 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 882 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
883 883
884 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 884 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
885 if (!int_ret) return ELM_THEME_APPLY_FAILED; 885 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
886 886
887 _spinner_buttons_add(obj, sd); 887 _spinner_buttons_add(obj, sd);
888 888
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 06bc876..2486cb0 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -560,13 +560,13 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
560 sd->cur.ampm = -1; 560 sd->cur.ampm = -1;
561} 561}
562 562
563EOLIAN static Elm_Theme_Apply 563EOLIAN static Efl_Ui_Theme_Apply
564_elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED) 564_elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
565{ 565{
566 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 566 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
567 567
568 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 568 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
569 if (!int_ret) return ELM_THEME_APPLY_FAILED; 569 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
570 570
571 _time_update(obj, EINA_TRUE); 571 _time_update(obj, EINA_TRUE);
572 572
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 334c2ee..aa6404d 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1292,7 +1292,7 @@ _color_bars_add(Evas_Object *obj)
1292 } 1292 }
1293} 1293}
1294 1294
1295EOLIAN static Elm_Theme_Apply 1295EOLIAN static Efl_Ui_Theme_Apply
1296_elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) 1296_elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
1297{ 1297{
1298 int i; 1298 int i;
@@ -1303,11 +1303,11 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
1303 unsigned int h_pad = DEFAULT_HOR_PAD; 1303 unsigned int h_pad = DEFAULT_HOR_PAD;
1304 unsigned int v_pad = DEFAULT_VER_PAD; 1304 unsigned int v_pad = DEFAULT_VER_PAD;
1305 1305
1306 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 1306 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
1307 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 1307 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
1308 1308
1309 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 1309 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
1310 if (!int_ret) return ELM_THEME_APPLY_FAILED; 1310 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
1311 1311
1312 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) || 1312 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) ||
1313 (sd->mode == ELM_COLORSELECTOR_ALL) || 1313 (sd->mode == ELM_COLORSELECTOR_ALL) ||
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 6cd6b77..c7cb1f7 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -569,13 +569,13 @@ _on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED)
569 } 569 }
570} 570}
571 571
572EOLIAN static Elm_Theme_Apply 572EOLIAN static Efl_Ui_Theme_Apply
573_elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) 573_elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
574{ 574{
575 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 575 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
576 576
577 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 577 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
578 if (!int_ret) return ELM_THEME_APPLY_FAILED; 578 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
579 579
580 _conformant_parts_swallow(obj); 580 _conformant_parts_swallow(obj);
581 581
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index bd98932..7d85d16 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -123,17 +123,17 @@ _item_location_get(Elm_Dayselector_Data *sd,
123 ELM_DAYSELECTOR_MAX; 123 ELM_DAYSELECTOR_MAX;
124} 124}
125 125
126EOLIAN static Elm_Theme_Apply 126EOLIAN static Efl_Ui_Theme_Apply
127_elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd) 127_elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
128{ 128{
129 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 129 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
130 130
131 Eina_List *l; 131 Eina_List *l;
132 char buf[1024]; 132 char buf[1024];
133 Elm_Dayselector_Item_Data *it; 133 Elm_Dayselector_Item_Data *it;
134 134
135 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 135 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
136 if (!int_ret) return ELM_THEME_APPLY_FAILED; 136 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
137 137
138 EINA_LIST_FOREACH(sd->items, l, it) 138 EINA_LIST_FOREACH(sd->items, l, it)
139 { 139 {
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 860643f..e243196 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -812,18 +812,18 @@ _theme_data_get(Evas_Object *obj)
812 else sd->minh = -1; 812 else sd->minh = -1;
813} 813}
814 814
815EOLIAN static Elm_Theme_Apply 815EOLIAN static Efl_Ui_Theme_Apply
816_elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) 816_elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
817{ 817{
818 Eina_List *l; 818 Eina_List *l;
819 Elm_Diskselector_Item_Data *it; 819 Elm_Diskselector_Item_Data *it;
820 Evas_Object *blank; 820 Evas_Object *blank;
821 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 821 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
822 Evas *evas; 822 Evas *evas;
823 const char *style = elm_widget_style_get(obj); 823 const char *style = elm_widget_style_get(obj);
824 824
825 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 825 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
826 if (!int_ret) return ELM_THEME_APPLY_FAILED; 826 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
827 827
828 evas = evas_object_evas_get(obj); 828 evas = evas_object_evas_get(obj);
829 evas_event_freeze(evas); 829 evas_event_freeze(evas);
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 5f37440..3c9603a 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -855,21 +855,21 @@ _elm_entry_background_switch(Evas_Object *from_edje, Evas_Object *to_edje)
855 855
856/* we can't issue the layout's theming code here, cause it assumes an 856/* we can't issue the layout's theming code here, cause it assumes an
857 * unique edje object, always */ 857 * unique edje object, always */
858EOLIAN static Elm_Theme_Apply 858EOLIAN static Efl_Ui_Theme_Apply
859_elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) 859_elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
860{ 860{
861 const char *str; 861 const char *str;
862 const char *t; 862 const char *t;
863 const char *stl_user; 863 const char *stl_user;
864 const char *style = elm_widget_style_get(obj); 864 const char *style = elm_widget_style_get(obj);
865 Elm_Theme_Apply theme_apply; 865 Efl_Ui_Theme_Apply theme_apply;
866 866
867 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 867 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
868 868
869 // Note: We are skipping elm_layout here! This is by design. 869 // Note: We are skipping elm_layout here! This is by design.
870 // This assumes the following inheritance: my_class -> layout -> widget ... 870 // This assumes the following inheritance: my_class -> layout -> widget ...
871 theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); 871 theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
872 if (!theme_apply) return ELM_THEME_APPLY_FAILED; 872 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
873 873
874 evas_event_freeze(evas_object_evas_get(obj)); 874 evas_event_freeze(evas_object_evas_get(obj));
875 875
@@ -949,7 +949,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
949 949
950 if (sd->scroll) 950 if (sd->scroll)
951 { 951 {
952 Elm_Theme_Apply ok = ELM_THEME_APPLY_FAILED; 952 Efl_Ui_Theme_Apply ok = EFL_UI_THEME_APPLY_FAILED;
953 953
954 elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj)); 954 elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj));
955 955
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index b259710..4176ce9 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -350,16 +350,16 @@ _item_new(Evas_Object *obj,
350 return eo_item; 350 return eo_item;
351} 351}
352 352
353EOLIAN static Elm_Theme_Apply 353EOLIAN static Efl_Ui_Theme_Apply
354_elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd) 354_elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd)
355{ 355{
356 const char *max_len; 356 const char *max_len;
357 357
358 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 358 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
360 360
361 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 361 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
362 if (!int_ret) return ELM_THEME_APPLY_FAILED; 362 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
363 363
364 max_len = edje_object_data_get(wd->resize_obj, "max_len"); 364 max_len = edje_object_data_get(wd->resize_obj, "max_len");
365 if (!max_len) sd->max_len = MAX_LEN_DEFAULT; 365 if (!max_len) sd->max_len = MAX_LEN_DEFAULT;
diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot
index 543bfa6..cf52477 100644
--- a/src/lib/elementary/elm_general.eot
+++ b/src/lib/elementary/elm_general.eot
@@ -1,3 +1,17 @@
1enum Efl.Ui.Theme.Apply
2{
3 [[Return error code when setting the style on a widget.]]
4 failed = 0, [[Failed to apply theme. The widget may become unusable.]]
5 default = 1, [[Successfully applied the default style. The widget may
6 look different from the rest of the UI if a custom theme
7 is in use, but it should be usable.]]
8 success = 3 [[Successfully applied the requested style from the current
9 theme.]]
10}
11
12
13/* The below Elm names need to be cleaned up... */
14
1struct Elm.Event.Policy_Changed 15struct Elm.Event.Policy_Changed
2{ 16{
3 [[Data on the event when an Elementary policy has changed]] 17 [[Data on the event when an Elementary policy has changed]]
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 3c00629..3808a60 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -1121,10 +1121,10 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
1121 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); 1121 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
1122 snprintf(buf, sizeof(buf), "item/%s", style ? style : "default"); 1122 snprintf(buf, sizeof(buf), "item/%s", style ? style : "default");
1123 1123
1124 Elm_Theme_Apply th_ret = 1124 Efl_Ui_Theme_Apply th_ret =
1125 elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf, 1125 elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf,
1126 elm_widget_style_get(WIDGET(it))); 1126 elm_widget_style_get(WIDGET(it)));
1127 if (th_ret == ELM_THEME_APPLY_FAILED) 1127 if (th_ret == EFL_UI_THEME_APPLY_FAILED)
1128 { 1128 {
1129 ERR("%s is not a valid gengrid item style. " 1129 ERR("%s is not a valid gengrid item style. "
1130 "Automatically falls back into default style.", 1130 "Automatically falls back into default style.",
@@ -3658,12 +3658,12 @@ _mirrored_set(Evas_Object *obj,
3658 } 3658 }
3659} 3659}
3660 3660
3661EOLIAN static Elm_Theme_Apply 3661EOLIAN static Efl_Ui_Theme_Apply
3662_elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) 3662_elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
3663{ 3663{
3664 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 3664 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
3665 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 3665 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
3666 if (!int_ret) return ELM_THEME_APPLY_FAILED; 3666 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
3667 3667
3668 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 3668 _mirrored_set(obj, efl_ui_mirrored_get(obj));
3669 3669
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index f9fc39c..140ff61 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -542,10 +542,10 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
542 "",style ? : "default"); 542 "",style ? : "default");
543 } 543 }
544 544
545 Elm_Theme_Apply th_ret = 545 Efl_Ui_Theme_Apply th_ret =
546 elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf, 546 elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf,
547 elm_widget_style_get(WIDGET(it))); 547 elm_widget_style_get(WIDGET(it)));
548 if (th_ret == ELM_THEME_APPLY_FAILED) 548 if (th_ret == EFL_UI_THEME_APPLY_FAILED)
549 { 549 {
550 ERR("%s is not a valid genlist item style. " 550 ERR("%s is not a valid genlist item style. "
551 "Automatically falls back into default style.", 551 "Automatically falls back into default style.",
@@ -3439,16 +3439,16 @@ _mirrored_set(Evas_Object *obj,
3439 elm_interface_scrollable_mirrored_set(obj, rtl); 3439 elm_interface_scrollable_mirrored_set(obj, rtl);
3440} 3440}
3441 3441
3442EOLIAN static Elm_Theme_Apply 3442EOLIAN static Efl_Ui_Theme_Apply
3443_elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd) 3443_elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
3444{ 3444{
3445 Item_Block *itb; 3445 Item_Block *itb;
3446 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 3446 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
3447 Eina_List *l; 3447 Eina_List *l;
3448 Elm_Gen_Item *it; 3448 Elm_Gen_Item *it;
3449 3449
3450 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 3450 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
3451 if (!int_ret) return ELM_THEME_APPLY_FAILED; 3451 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
3452 3452
3453 evas_event_freeze(evas_object_evas_get(obj)); 3453 evas_event_freeze(evas_object_evas_get(obj));
3454 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 3454 _mirrored_set(obj, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index 7a8e050..fcccfb0 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -112,13 +112,13 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
112 evas_object_grid_mirrored_set(wd->resize_obj, rtl); 112 evas_object_grid_mirrored_set(wd->resize_obj, rtl);
113} 113}
114 114
115EOLIAN static Elm_Theme_Apply 115EOLIAN static Efl_Ui_Theme_Apply
116_elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 116_elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
117{ 117{
118 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 118 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
119 119
120 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 120 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
121 if (!int_ret) return ELM_THEME_APPLY_FAILED; 121 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
122 122
123 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 123 _mirrored_set(obj, efl_ui_mirrored_get(obj));
124 124
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index d4581cd..322f33f 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -297,12 +297,12 @@ _hov_show_do(Evas_Object *obj)
297 } 297 }
298} 298}
299 299
300EOLIAN static Elm_Theme_Apply 300EOLIAN static Efl_Ui_Theme_Apply
301_elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) 301_elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd)
302{ 302{
303 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 303 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
304 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 304 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
305 if (!int_ret) return ELM_THEME_APPLY_FAILED; 305 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
306 306
307 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj); 307 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj);
308 308
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 8ae6e6a..0941cd9 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -363,16 +363,16 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
363 return EINA_TRUE; 363 return EINA_TRUE;
364} 364}
365 365
366EOLIAN static Elm_Theme_Apply 366EOLIAN static Efl_Ui_Theme_Apply
367_elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd) 367_elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd)
368{ 368{
369 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 369 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
370 370
371 if (sd->stdicon) 371 if (sd->stdicon)
372 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 372 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
373 373
374 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 374 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
375 if (!int_ret) return ELM_THEME_APPLY_FAILED; 375 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
376 376
377 return int_ret; 377 return int_ret;
378} 378}
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 2de781e..7bc387c 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -439,13 +439,13 @@ _index_priority_change(void *data, Elm_Index_Item_Data *it)
439 } 439 }
440} 440}
441 441
442EOLIAN static Elm_Theme_Apply 442EOLIAN static Efl_Ui_Theme_Apply
443_elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) 443_elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
444{ 444{
445 Evas_Coord minw = 0, minh = 0; 445 Evas_Coord minw = 0, minh = 0;
446 Elm_Object_Item *eo_item; 446 Elm_Object_Item *eo_item;
447 447
448 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 448 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
449 449
450 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 450 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
451 EFL_UI_LAYOUT_DATA_GET(obj, ld); 451 EFL_UI_LAYOUT_DATA_GET(obj, ld);
@@ -459,7 +459,7 @@ _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
459 eina_stringshare_replace(&ld->group, "base/vertical"); 459 eina_stringshare_replace(&ld->group, "base/vertical");
460 460
461 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 461 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
462 if (!int_ret) return ELM_THEME_APPLY_FAILED; 462 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
463 463
464 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 464 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
465 evas_object_size_hint_min_set(sd->event_rect[0], minw, minh); 465 evas_object_size_hint_min_set(sd->event_rect[0], minw, minh);
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index d3c8fba..6a451df 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -181,17 +181,17 @@ _elm_label_horizontal_size_policy_update(Eo *obj, Elm_Label_Data *sd)
181 edje_object_message_signal_process(wd->resize_obj); 181 edje_object_message_signal_process(wd->resize_obj);
182} 182}
183 183
184EOLIAN static Elm_Theme_Apply 184EOLIAN static Efl_Ui_Theme_Apply
185_elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) 185_elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
186{ 186{
187 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 187 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
188 188
189 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 189 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
190 190
191 evas_event_freeze(evas_object_evas_get(obj)); 191 evas_event_freeze(evas_object_evas_get(obj));
192 192
193 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 193 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
194 if (!int_ret) return ELM_THEME_APPLY_FAILED; 194 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
195 195
196 _elm_label_horizontal_size_policy_update(obj, sd); 196 _elm_label_horizontal_size_policy_update(obj, sd);
197 197
diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h
index e59699f..2bd77e5 100644
--- a/src/lib/elementary/elm_layout_legacy.h
+++ b/src/lib/elementary/elm_layout_legacy.h
@@ -41,6 +41,23 @@ typedef struct _Elm_Layout_Part_Alias_Description Elm_Layout_Part_Alias_Descript
41EAPI Evas_Object *elm_layout_add(Evas_Object *parent); 41EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
42 42
43/** 43/**
44 * @brief Set the edje group from the elementary theme that will be used as
45 * layout.
46 *
47 * Note that @c style will be the new style of @c obj too, as in an @ref
48 * elm_object_style_set call.
49 *
50 * @param[in] klass The class of the group.
51 * @param[in] group The group.
52 * @param[in] style The style to used.
53 *
54 * @return @c true on success, @c false otherwise
55 *
56 * @ingroup Elm_Layout
57 */
58EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style);
59
60/**
44 * @brief Get the edje data from the given layout. 61 * @brief Get the edje data from the given layout.
45 * 62 *
46 * This function fetches data specified inside the edje theme of this layout. 63 * This function fetches data specified inside the edje theme of this layout.
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 64af470..d71ac4f 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1092,15 +1092,15 @@ _mirrored_set(Evas_Object *obj,
1092 } 1092 }
1093} 1093}
1094 1094
1095EOLIAN static Elm_Theme_Apply 1095EOLIAN static Efl_Ui_Theme_Apply
1096_elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd) 1096_elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
1097{ 1097{
1098 Elm_Object_Item *eo_it; 1098 Elm_Object_Item *eo_it;
1099 Eina_List *n; 1099 Eina_List *n;
1100 1100
1101 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 1101 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
1102 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 1102 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
1103 if (!int_ret) return ELM_THEME_APPLY_FAILED; 1103 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
1104 1104
1105 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 1105 _mirrored_set(obj, efl_ui_mirrored_get(obj));
1106 1106
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index a3beee1..b765b41 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3981,13 +3981,13 @@ _elm_map_pan_class_constructor(Efl_Class *klass)
3981 3981
3982#include "elm_map_pan.eo.c" 3982#include "elm_map_pan.eo.c"
3983 3983
3984EOLIAN static Elm_Theme_Apply 3984EOLIAN static Efl_Ui_Theme_Apply
3985_elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED) 3985_elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
3986{ 3986{
3987 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 3987 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
3988 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 3988 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
3989 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 3989 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
3990 if (!int_ret) return ELM_THEME_APPLY_FAILED; 3990 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
3991 3991
3992 3992
3993 elm_widget_theme_object_set 3993 elm_widget_theme_object_set
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 2f51bef..352b0df 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -35,12 +35,12 @@ _sizing_eval(Evas_Object *obj)
35 evas_object_size_hint_max_set(obj, maxw, maxh); 35 evas_object_size_hint_max_set(obj, maxw, maxh);
36} 36}
37 37
38EOLIAN static Elm_Theme_Apply 38EOLIAN static Efl_Ui_Theme_Apply
39_elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) 39_elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
40{ 40{
41 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 41 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
42 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 42 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
43 if (!int_ret) return ELM_THEME_APPLY_FAILED; 43 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
44 44
45 _sizing_eval(obj); 45 _sizing_eval(obj);
46 46
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 8f8bf96..a4baf34 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -229,10 +229,10 @@ _sizing_eval(Evas_Object *obj)
229 } 229 }
230} 230}
231 231
232EOLIAN static Elm_Theme_Apply 232EOLIAN static Efl_Ui_Theme_Apply
233_elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) 233_elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
234{ 234{
235 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 235 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
236 236
237 Eina_List *l, *_l, *_ll, *ll = NULL; 237 Eina_List *l, *_l, *_ll, *ll = NULL;
238 Elm_Object_Item *eo_item; 238 Elm_Object_Item *eo_item;
@@ -240,7 +240,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
240 char style[1024]; 240 char style[1024];
241 241
242 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 242 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
243 if (!int_ret) return ELM_THEME_APPLY_FAILED; 243 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
244 244
245 if (sd->menu_bar) 245 if (sd->menu_bar)
246 snprintf(style, sizeof(style), "main_menu/%s", elm_widget_style_get(obj)); 246 snprintf(style, sizeof(style), "main_menu/%s", elm_widget_style_get(obj));
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index cd8f77f..0e178a1 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -19,7 +19,7 @@
19#define MY_CLASS_NAME "Elm_Notify" 19#define MY_CLASS_NAME "Elm_Notify"
20#define MY_CLASS_NAME_LEGACY "elm_notify" 20#define MY_CLASS_NAME_LEGACY "elm_notify"
21 21
22static Elm_Theme_Apply 22static Efl_Ui_Theme_Apply
23_notify_theme_apply(Evas_Object *obj) 23_notify_theme_apply(Evas_Object *obj)
24{ 24{
25 const char *style = elm_widget_style_get(obj); 25 const char *style = elm_widget_style_get(obj);
@@ -140,12 +140,12 @@ _sizing_eval(Evas_Object *obj)
140 evas_object_resize(obj, w, h); 140 evas_object_resize(obj, w, h);
141} 141}
142 142
143EOLIAN static Elm_Theme_Apply 143EOLIAN static Efl_Ui_Theme_Apply
144_elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) 144_elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
145{ 145{
146 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 146 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
147 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 147 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
148 if (!int_ret) return ELM_THEME_APPLY_FAILED; 148 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
149 149
150 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 150 _mirrored_set(obj, efl_ui_mirrored_get(obj));
151 151
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 7afddfa..5c6ee59 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -212,18 +212,18 @@ _scrollable_layout_theme_set(Eo *obj, Elm_Panel_Data *sd)
212 _access_obj_process(obj, EINA_TRUE); 212 _access_obj_process(obj, EINA_TRUE);
213} 213}
214 214
215EOLIAN static Elm_Theme_Apply 215EOLIAN static Efl_Ui_Theme_Apply
216_elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) 216_elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
217{ 217{
218 const char *str; 218 const char *str;
219 Evas_Coord minw = 0, minh = 0; 219 Evas_Coord minw = 0, minh = 0;
220 220
221 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 221 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
222 222
223 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 223 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
224 224
225 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 225 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
226 if (!int_ret) return ELM_THEME_APPLY_FAILED; 226 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
227 227
228 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 228 _mirrored_set(obj, efl_ui_mirrored_get(obj));
229 229
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 5595559..d45f38c 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -49,14 +49,14 @@ _sizing_eval(Evas_Object *obj)
49 evas_object_size_hint_max_set(obj, maxw, maxh); 49 evas_object_size_hint_max_set(obj, maxw, maxh);
50} 50}
51 51
52EOLIAN static Elm_Theme_Apply 52EOLIAN static Efl_Ui_Theme_Apply
53_elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd) 53_elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
54{ 54{
55 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 55 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
57 57
58 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 58 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
59 if (!int_ret) return ELM_THEME_APPLY_FAILED; 59 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
60 60
61 edje_object_mirrored_set 61 edje_object_mirrored_set
62 (wd->resize_obj, efl_ui_mirrored_get(obj)); 62 (wd->resize_obj, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 6bcc4a8..05be432 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -80,12 +80,12 @@ _elm_plug_elm_widget_on_focus(Eo *obj, void *sd EINA_UNUSED, Elm_Object_Item *it
80 return EINA_TRUE; 80 return EINA_TRUE;
81} 81}
82 82
83EOLIAN static Elm_Theme_Apply 83EOLIAN static Efl_Ui_Theme_Apply
84_elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 84_elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
85{ 85{
86 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 86 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
87 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 87 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
88 if (!int_ret) return ELM_THEME_APPLY_FAILED; 88 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
89 89
90 _sizing_eval(obj); 90 _sizing_eval(obj);
91 91
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 5435e45..763b2ba 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -391,7 +391,7 @@ void _elm_win_standard_init(Eo *win);
391 391
392Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee); 392Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee);
393 393
394Elm_Theme_Apply _elm_theme_object_set(Evas_Object *parent, 394Efl_Ui_Theme_Apply _elm_theme_object_set(Evas_Object *parent,
395 Evas_Object *o, 395 Evas_Object *o,
396 const char *clas, 396 const char *clas,
397 const char *group, 397 const char *group,
@@ -399,7 +399,7 @@ Elm_Theme_Apply _elm_theme_object_set(Evas_Object *parent,
399Eina_Bool _elm_theme_object_icon_set(Evas_Object *o, 399Eina_Bool _elm_theme_object_icon_set(Evas_Object *o,
400 const char *group, 400 const char *group,
401 const char *style); 401 const char *style);
402Elm_Theme_Apply _elm_theme_set(Elm_Theme *th, 402Efl_Ui_Theme_Apply _elm_theme_set(Elm_Theme *th,
403 Evas_Object *o, 403 Evas_Object *o,
404 const char *clas, 404 const char *clas,
405 const char *group, 405 const char *group,
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index 27f7688..df8e24a 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -86,12 +86,12 @@ _move_resize_cb(void *data EINA_UNUSED,
86 _sizing_eval(obj); 86 _sizing_eval(obj);
87} 87}
88 88
89EOLIAN static Elm_Theme_Apply 89EOLIAN static Efl_Ui_Theme_Apply
90_elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) 90_elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED)
91{ 91{
92 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 92 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
93 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 93 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
94 if (!int_ret) return ELM_THEME_APPLY_FAILED; 94 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
95 95
96 //TODO 96 //TODO
97 97
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index cee8c4d..d022561 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -403,12 +403,12 @@ _mirrored_set(Evas_Object *obj,
403 elm_interface_scrollable_mirrored_set(obj, mirrored); 403 elm_interface_scrollable_mirrored_set(obj, mirrored);
404} 404}
405 405
406EOLIAN static Elm_Theme_Apply 406EOLIAN static Efl_Ui_Theme_Apply
407_elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) 407_elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
408{ 408{
409 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 409 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
410 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 410 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
411 if (!int_ret) return ELM_THEME_APPLY_FAILED; 411 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
412 412
413 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 413 _mirrored_set(obj, efl_ui_mirrored_get(obj));
414 414
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 1d91307..704a8b7 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -215,16 +215,16 @@ _update_list(Elm_Segment_Control_Data *sd)
215 } 215 }
216} 216}
217 217
218EOLIAN static Elm_Theme_Apply 218EOLIAN static Efl_Ui_Theme_Apply
219_elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd) 219_elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd)
220{ 220{
221 Eina_List *l; 221 Eina_List *l;
222 Eina_Bool rtl; 222 Eina_Bool rtl;
223 Elm_Object_Item *eo_item; 223 Elm_Object_Item *eo_item;
224 224
225 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 225 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
226 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 226 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
227 if (!int_ret) return ELM_THEME_APPLY_FAILED; 227 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
228 228
229 rtl = efl_ui_mirrored_get(obj); 229 rtl = efl_ui_mirrored_get(obj);
230 230
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index e0ad2a0..e9d3952 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -16,10 +16,10 @@
16#define MY_CLASS_NAME "Elm_Separator" 16#define MY_CLASS_NAME "Elm_Separator"
17#define MY_CLASS_NAME_LEGACY "elm_separator" 17#define MY_CLASS_NAME_LEGACY "elm_separator"
18 18
19EOLIAN static Elm_Theme_Apply 19EOLIAN static Efl_Ui_Theme_Apply
20_elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) 20_elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
21{ 21{
22 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 22 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
23 EFL_UI_LAYOUT_DATA_GET(obj, ld); 23 EFL_UI_LAYOUT_DATA_GET(obj, ld);
24 24
25 if (sd->orientation == EFL_ORIENT_HORIZONTAL) 25 if (sd->orientation == EFL_ORIENT_HORIZONTAL)
@@ -28,7 +28,7 @@ _elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
28 eina_stringshare_replace(&ld->group, "vertical"); 28 eina_stringshare_replace(&ld->group, "vertical");
29 29
30 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 30 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
31 if (!int_ret) return ELM_THEME_APPLY_FAILED; 31 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
32 32
33 return int_ret; 33 return int_ret;
34} 34}
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 0ea3e38..86eb11f 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1266,10 +1266,10 @@ _elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd)
1266 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 1266 efl_canvas_group_del(efl_super(obj, MY_CLASS));
1267} 1267}
1268 1268
1269EOLIAN static Elm_Theme_Apply 1269EOLIAN static Efl_Ui_Theme_Apply
1270_elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_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, ELM_THEME_APPLY_FAILED); 1272 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
1273 1273
1274 if (!elm_layout_theme_set(obj, "spinner", "base", elm_widget_style_get(obj))) 1274 if (!elm_layout_theme_set(obj, "spinner", "base", elm_widget_style_get(obj)))
1275 CRI("Failed to set layout!"); 1275 CRI("Failed to set layout!");
@@ -1315,7 +1315,7 @@ _elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd)
1315 _access_spinner_register(obj, EINA_TRUE); 1315 _access_spinner_register(obj, EINA_TRUE);
1316 1316
1317 elm_layout_sizing_eval(obj); 1317 elm_layout_sizing_eval(obj);
1318 return ELM_THEME_APPLY_SUCCESS; 1318 return EFL_UI_THEME_APPLY_SUCCESS;
1319} 1319}
1320 1320
1321static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE; 1321static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE;
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index 39f4754..c3720e1 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -115,12 +115,12 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
115 evas_object_table_mirrored_set(wd->resize_obj, rtl); 115 evas_object_table_mirrored_set(wd->resize_obj, rtl);
116} 116}
117 117
118EOLIAN static Elm_Theme_Apply 118EOLIAN static Efl_Ui_Theme_Apply
119_elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 119_elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
120{ 120{
121 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 121 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
122 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 122 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
123 if (!int_ret) return ELM_THEME_APPLY_FAILED; 123 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
124 124
125 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 125 _mirrored_set(obj, efl_ui_mirrored_get(obj));
126 126
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index fe31f74..3f2144b 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -275,7 +275,7 @@ _elm_theme_data_find(Elm_Theme *th, const char *key)
275 return NULL; 275 return NULL;
276} 276}
277 277
278Elm_Theme_Apply 278Efl_Ui_Theme_Apply
279_elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style) 279_elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style)
280{ 280{
281 Elm_Theme *th = NULL; 281 Elm_Theme *th = NULL;
@@ -295,13 +295,13 @@ _elm_theme_object_icon_set(Evas_Object *o,
295 return _elm_theme_icon_set(th, o, group, style); 295 return _elm_theme_icon_set(th, o, group, style);
296} 296}
297 297
298Elm_Theme_Apply 298Efl_Ui_Theme_Apply
299_elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style) 299_elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style)
300{ 300{
301 Eina_File *file; 301 Eina_File *file;
302 char buf2[1024]; 302 char buf2[1024];
303 303
304 if ((!clas) || (!group) || (!style) || !o) return ELM_THEME_APPLY_FAILED; 304 if ((!clas) || (!group) || (!style) || !o) return EFL_UI_THEME_APPLY_FAILED;
305 if (!th) th = &(theme_default); 305 if (!th) th = &(theme_default);
306 snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, group, style); 306 snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, group, style);
307 if (!eina_hash_find(th->cache_style_load_failed, buf2)) 307 if (!eina_hash_find(th->cache_style_load_failed, buf2))
@@ -309,7 +309,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
309 file = _elm_theme_group_file_find(th, buf2); 309 file = _elm_theme_group_file_find(th, buf2);
310 if (file) 310 if (file)
311 { 311 {
312 if (edje_object_mmap_set(o, file, buf2)) return ELM_THEME_APPLY_SUCCESS; 312 if (edje_object_mmap_set(o, file, buf2)) return EFL_UI_THEME_APPLY_SUCCESS;
313 else 313 else
314 { 314 {
315 INF("could not set theme group '%s' from file '%s': %s", 315 INF("could not set theme group '%s' from file '%s': %s",
@@ -333,7 +333,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
333 { 333 {
334 INF("could not set theme style '%s', fallback to default", 334 INF("could not set theme style '%s', fallback to default",
335 style); 335 style);
336 return ELM_THEME_APPLY_DEFAULT; 336 return EFL_UI_THEME_APPLY_DEFAULT;
337 } 337 }
338 else 338 else
339 { 339 {
@@ -346,7 +346,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
346 //style not found, add to the not found list 346 //style not found, add to the not found list
347 eina_hash_add(th->cache_style_load_failed, buf2, (void *)1); 347 eina_hash_add(th->cache_style_load_failed, buf2, (void *)1);
348 } 348 }
349 return ELM_THEME_APPLY_FAILED; 349 return EFL_UI_THEME_APPLY_FAILED;
350} 350}
351 351
352Eina_Bool 352Eina_Bool
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 8a7b667..efa8be8 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -1530,18 +1530,18 @@ _elm_toolbar_highlight_in_theme(Evas_Object *obj)
1530 elm_widget_highlight_in_theme_set(obj, EINA_FALSE); 1530 elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
1531} 1531}
1532 1532
1533EOLIAN static Elm_Theme_Apply 1533EOLIAN static Efl_Ui_Theme_Apply
1534_elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) 1534_elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1535{ 1535{
1536 Elm_Toolbar_Item_Data *it; 1536 Elm_Toolbar_Item_Data *it;
1537 double scale = 0; 1537 double scale = 0;
1538 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 1538 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
1539 1539
1540 if (sd->delete_me) return ELM_THEME_APPLY_SUCCESS; 1540 if (sd->delete_me) return EFL_UI_THEME_APPLY_SUCCESS;
1541 1541
1542 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 1542 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
1543 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 1543 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
1544 if (!int_ret) return ELM_THEME_APPLY_FAILED; 1544 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
1545 1545
1546 elm_widget_theme_object_set 1546 elm_widget_theme_object_set
1547 (obj, wd->resize_obj, "toolbar", "base", 1547 (obj, wd->resize_obj, "toolbar", "base",
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 505d545..b21436b 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1187,16 +1187,16 @@ _elm_widget_access(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED,
1187{ 1187{
1188} 1188}
1189 1189
1190EAPI Elm_Theme_Apply 1190EAPI Efl_Ui_Theme_Apply
1191elm_widget_theme(Evas_Object *obj) 1191elm_widget_theme(Evas_Object *obj)
1192{ 1192{
1193 const Eina_List *l; 1193 const Eina_List *l;
1194 Evas_Object *child; 1194 Evas_Object *child;
1195 Elm_Tooltip *tt; 1195 Elm_Tooltip *tt;
1196 Elm_Cursor *cur; 1196 Elm_Cursor *cur;
1197 Elm_Theme_Apply ret = ELM_THEME_APPLY_SUCCESS; 1197 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_SUCCESS;
1198 1198
1199 API_ENTRY return ELM_THEME_APPLY_FAILED; 1199 API_ENTRY return EFL_UI_THEME_APPLY_FAILED;
1200 1200
1201 EINA_LIST_FOREACH(sd->subobjs, l, child) 1201 EINA_LIST_FOREACH(sd->subobjs, l, child)
1202 if (_elm_widget_is(child)) 1202 if (_elm_widget_is(child))
@@ -1209,7 +1209,7 @@ elm_widget_theme(Evas_Object *obj)
1209 EINA_LIST_FOREACH(sd->cursors, l, cur) 1209 EINA_LIST_FOREACH(sd->cursors, l, cur)
1210 elm_cursor_theme(cur); 1210 elm_cursor_theme(cur);
1211 1211
1212 Elm_Theme_Apply ret2 = ELM_THEME_APPLY_FAILED; 1212 Efl_Ui_Theme_Apply ret2 = EFL_UI_THEME_APPLY_FAILED;
1213 ret2 = elm_obj_widget_theme_apply(obj); 1213 ret2 = elm_obj_widget_theme_apply(obj);
1214 ret &= ret2; 1214 ret &= ret2;
1215 1215
@@ -1261,14 +1261,14 @@ elm_widget_theme_specific(Evas_Object *obj,
1261 elm_obj_widget_theme_apply(obj); 1261 elm_obj_widget_theme_apply(obj);
1262} 1262}
1263 1263
1264EOLIAN static Elm_Theme_Apply 1264EOLIAN static Efl_Ui_Theme_Apply
1265_elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 1265_elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
1266{ 1266{
1267 _elm_widget_mirrored_reload(obj); 1267 _elm_widget_mirrored_reload(obj);
1268 if (elm_widget_disabled_get(obj)) 1268 if (elm_widget_disabled_get(obj))
1269 elm_widget_disabled_internal(obj, elm_widget_disabled_get(obj)); 1269 elm_widget_disabled_internal(obj, elm_widget_disabled_get(obj));
1270 1270
1271 return ELM_THEME_APPLY_SUCCESS; 1271 return EFL_UI_THEME_APPLY_SUCCESS;
1272} 1272}
1273 1273
1274/** 1274/**
@@ -3928,13 +3928,13 @@ _elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
3928 return sd->theme; 3928 return sd->theme;
3929} 3929}
3930 3930
3931EOLIAN static Elm_Theme_Apply 3931EOLIAN static Efl_Ui_Theme_Apply
3932_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) 3932_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
3933{ 3933{
3934 if (eina_stringshare_replace(&sd->style, style)) 3934 if (eina_stringshare_replace(&sd->style, style))
3935 return elm_widget_theme(obj); 3935 return elm_widget_theme(obj);
3936 3936
3937 return ELM_THEME_APPLY_SUCCESS; 3937 return EFL_UI_THEME_APPLY_SUCCESS;
3938} 3938}
3939 3939
3940EOLIAN static const char* 3940EOLIAN static const char*
@@ -4030,13 +4030,13 @@ _elm_widget_item_loop_enabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
4030 return EINA_FALSE; 4030 return EINA_FALSE;
4031} 4031}
4032 4032
4033EOLIAN static Elm_Theme_Apply 4033EOLIAN static Efl_Ui_Theme_Apply
4034_elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) 4034_elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle)
4035{ 4035{
4036 Elm_Theme_Apply ret = _elm_theme_object_set(obj, edj, wname, welement, wstyle); 4036 Efl_Ui_Theme_Apply ret = _elm_theme_object_set(obj, edj, wname, welement, wstyle);
4037 if (!ret) 4037 if (!ret)
4038 { 4038 {
4039 return ELM_THEME_APPLY_FAILED; 4039 return EFL_UI_THEME_APPLY_FAILED;
4040 } 4040 }
4041 4041
4042 if (sd->orient_mode != -1) 4042 if (sd->orient_mode != -1)
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 121d6ff..5c369ba 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -18,14 +18,6 @@ enum Elm.Activate
18 back, [[Activate back]] 18 back, [[Activate back]]
19} 19}
20 20
21enum Elm.Theme.Apply
22{
23 [[Return codes when a Elementary theme is applied]]
24 failed = 0, [[Failed to apply theme]]
25 default = 1, [[Default return value]]
26 success = 3 [[Success to apply theme]]
27}
28
29struct Elm.Tooltip; [[Elementary tooltip]] 21struct Elm.Tooltip; [[Elementary tooltip]]
30struct @extern Elm.Theme; [[Elementary theme]] 22struct @extern Elm.Theme; [[Elementary theme]]
31 23
@@ -65,6 +57,32 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
65 disabled: bool(false); [[$true if the widget is disabled.]] 57 disabled: bool(false); [[$true if the widget is disabled.]]
66 } 58 }
67 } 59 }
60 @property style {
61 [[The widget style to use.
62
63 Styles define different look and feel for widgets, and may provide
64 different parts for layout-based widgets. Styles vary from widget
65 to widget and may be defined by other themes by means of extensions
66 and overlays.
67
68 The style can only be set before @Efl.Object.finalize, which means
69 at construction time of the object (inside $efl_add in C).
70 ]]
71 set {
72 [[Can only be called during construction, before finalize.]]
73 return: Efl.Ui.Theme.Apply(0);
74 [[Whether the style was successfully applied or not, see
75 the values of @Efl.Ui.Theme.Apply for more information.]]
76 }
77 get {
78 [[Returns the current style of a widget.]]
79 }
80 values {
81 style: string;
82 [[Name of the style to use. Refer to each widget's documentation
83 for the available style names, or to the themes in use.]]
84 }
85 }
68 86
69 @property focus { 87 @property focus {
70 [[Focus property]] 88 [[Focus property]]
@@ -119,17 +137,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
119 disabled: bool; [[$true if orientation mode is disabled, $false otherwise]] 137 disabled: bool; [[$true if orientation mode is disabled, $false otherwise]]
120 } 138 }
121 } 139 }
122 @property style {
123 [[Theme style]]
124 set {
125 return: Elm.Theme.Apply; [[Theme style]]
126 }
127 get {
128 }
129 values {
130 style: string; [[Style name]]
131 }
132 }
133 @property focus_custom_chain { 140 @property focus_custom_chain {
134 [[A custom chain of objects to pass focus. 141 [[A custom chain of objects to pass focus.
135 142
@@ -218,7 +225,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
218 @property theme_object { 225 @property theme_object {
219 [[Theme object property]] 226 [[Theme object property]]
220 set { 227 set {
221 return: Elm.Theme.Apply; [[Theme apply]] 228 return: Efl.Ui.Theme.Apply; [[Theme apply]]
222 } 229 }
223 values { 230 values {
224 edj: Efl.Canvas.Object; [[Edje object]] 231 edj: Efl.Canvas.Object; [[Edje object]]
@@ -678,7 +685,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
678 } 685 }
679 theme_apply { 686 theme_apply {
680 [['Virtual' function on the widget being re-themed.]] 687 [['Virtual' function on the widget being re-themed.]]
681 return: Elm.Theme.Apply; [[Theme apply]] 688 return: Efl.Ui.Theme.Apply; [[Theme apply]]
682 } 689 }
683 focus_direction_get @const { 690 focus_direction_get @const {
684 [[Get focus direction]] 691 [[Get focus direction]]
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index 40579b8..8c7382f 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -638,7 +638,7 @@ EAPI Evas_Object *elm_widget_add(Evas_Smart *, Evas_Object *);
638EAPI void elm_widget_parent_set(Evas_Object *, Evas_Object *); 638EAPI void elm_widget_parent_set(Evas_Object *, Evas_Object *);
639EAPI Eina_Bool elm_widget_api_check(int ver); 639EAPI Eina_Bool elm_widget_api_check(int ver);
640EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access); 640EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access);
641EAPI Elm_Theme_Apply elm_widget_theme(Evas_Object *obj); 641EAPI Efl_Ui_Theme_Apply elm_widget_theme(Evas_Object *obj);
642EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); 642EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force);
643EAPI void elm_widget_translate(Evas_Object *obj); 643EAPI void elm_widget_translate(Evas_Object *obj);
644EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Object *obj), void *data); 644EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Object *obj), void *data);
@@ -733,7 +733,7 @@ EAPI void elm_widget_scroll_freeze_pop(Evas_Object *obj);
733EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj); 733EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj);
734EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th); 734EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th);
735EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj); 735EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj);
736EAPI Elm_Theme_Apply elm_widget_style_set(Evas_Object *obj, const char *style); 736EAPI Efl_Ui_Theme_Apply elm_widget_style_set(Evas_Object *obj, const char *style);
737EAPI const char *elm_widget_style_get(const Evas_Object *obj); 737EAPI const char *elm_widget_style_get(const Evas_Object *obj);
738EAPI void elm_widget_type_set(Evas_Object *obj, const char *type); 738EAPI void elm_widget_type_set(Evas_Object *obj, const char *type);
739EAPI const char *elm_widget_type_get(const Evas_Object *obj); 739EAPI const char *elm_widget_type_get(const Evas_Object *obj);
@@ -749,7 +749,7 @@ EAPI int elm_widget_drag_child_locked_x_get(const Evas_Object *obj)
749EAPI int elm_widget_drag_child_locked_y_get(const Evas_Object *obj); 749EAPI int elm_widget_drag_child_locked_y_get(const Evas_Object *obj);
750EAPI void elm_widget_item_loop_enabled_set(Evas_Object *obj, Eina_Bool enable); 750EAPI void elm_widget_item_loop_enabled_set(Evas_Object *obj, Eina_Bool enable);
751EAPI Eina_Bool elm_widget_item_loop_enabled_get(const Evas_Object *obj); 751EAPI Eina_Bool elm_widget_item_loop_enabled_get(const Evas_Object *obj);
752EAPI Elm_Theme_Apply elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle); 752EAPI Efl_Ui_Theme_Apply elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle);
753EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func); 753EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func);
754EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse); 754EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse);
755EAPI Eina_List *elm_widget_stringlist_get(const char *str); 755EAPI Eina_List *elm_widget_stringlist_get(const char *str);