diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 8234cadddf..154e054b4f 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -55,7 +55,7 @@ efl_eolian_files = \ lib/efl/interfaces/efl_pack_layout.eo \ lib/efl/interfaces/efl_pack_linear.eo \ lib/efl/interfaces/efl_pack_table.eo \ - lib/efl/interfaces/efl_ui_base.eo \ + lib/efl/interfaces/efl_ui_i18n.eo \ lib/efl/interfaces/efl_ui_direction.eo \ lib/efl/interfaces/efl_ui_drag.eo \ lib/efl/interfaces/efl_ui_range.eo \ diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index a0c51749ad..34299e1e18 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c @@ -171,7 +171,7 @@ edje_object_part_external_content_get(const Edje_Object *obj, const char *part, return _edje_object_part_external_content_get(ed, part, content); } -/* Efl.Ui.Base APIs */ +/* Efl.Ui.I18n APIs */ EAPI void edje_object_mirrored_set(Edje_Object *obj, Eina_Bool rtl) { diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 692f5519b3..f9fac775ee 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -249,7 +249,7 @@ _edje_language_signal_emit(Edje *ed, Evas_Object *obj, char *signal) } EOLIAN void -_efl_canvas_layout_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *locale) +_efl_canvas_layout_efl_ui_i18n_language_set(Eo *obj, Edje *ed, const char *locale) { const char *lookup; char *signal; @@ -271,7 +271,7 @@ _efl_canvas_layout_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *local } EOLIAN const char * -_efl_canvas_layout_efl_ui_base_language_get(const Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_ui_i18n_language_get(const Eo *obj EINA_UNUSED, Edje *ed) { if (!ed->language) return _edje_language; @@ -417,7 +417,7 @@ edje_object_base_scale_get(const Evas_Object *obj) } EOLIAN Eina_Bool -_efl_canvas_layout_efl_ui_base_mirrored_get(const Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_ui_i18n_mirrored_get(const Eo *obj EINA_UNUSED, Edje *ed) { return ed->is_rtl; } @@ -433,7 +433,7 @@ _edje_object_orientation_inform(Evas_Object *obj) } EOLIAN void -_efl_canvas_layout_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) +_efl_canvas_layout_efl_ui_i18n_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) { unsigned short i; diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo index 71151f9df4..5feac56d84 100644 --- a/src/lib/edje/efl_canvas_layout.eo +++ b/src/lib/edje/efl_canvas_layout.eo @@ -110,8 +110,8 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, Efl.Layout.Signal.signal_callback_del; Efl.Layout.Signal.signal_emit; Efl.Layout.Signal.signal_process; - Efl.Ui.Base.mirrored { set; get; } - Efl.Ui.Base.language { set; get; } + Efl.Ui.I18n.mirrored { set; get; } + Efl.Ui.I18n.language { set; get; } Efl.Gfx.Entity.scale { set; get; } Efl.File.load_error { get; } Efl.File.mmap { get; set; } diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index fc56d4a0b8..1ff6767e6c 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -94,7 +94,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; #include "interfaces/efl_text.eo.h" #include "interfaces/efl_text_types.eot.h" #include "interfaces/efl_orientation.eo.h" -#include "interfaces/efl_ui_base.eo.h" +#include "interfaces/efl_ui_i18n.eo.h" #include "interfaces/efl_ui_direction.eo.h" #include "interfaces/efl_ui_drag.eo.h" #include "interfaces/efl_ui_range.eo.h" diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index cf9a8ee11a..5133def96b 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c @@ -63,7 +63,7 @@ #include "interfaces/efl_animator.eo.c" #include "interfaces/efl_interpolator.eo.c" #include "interfaces/efl_orientation.eo.c" -#include "interfaces/efl_ui_base.eo.c" +#include "interfaces/efl_ui_i18n.eo.c" #include "interfaces/efl_ui_direction.eo.c" #include "interfaces/efl_ui_drag.eo.c" #include "interfaces/efl_ui_range.eo.c" diff --git a/src/lib/efl/interfaces/efl_ui_direction.eo b/src/lib/efl/interfaces/efl_ui_direction.eo index 78bf2cdeda..7e5aa74c0e 100644 --- a/src/lib/efl/interfaces/efl_ui_direction.eo +++ b/src/lib/efl/interfaces/efl_ui_direction.eo @@ -36,7 +36,7 @@ interface Efl.Ui.Direction vertically or horizontally or inverted vertically or inverted horizontally. - Mirroring as defined in @Efl.Ui.Base can invert the $horizontal + Mirroring as defined in @Efl.Ui.I18n can invert the $horizontal direction: it is $ltr by default, but becomes $rtl if the object is mirrored. ]] diff --git a/src/lib/efl/interfaces/efl_ui_base.eo b/src/lib/efl/interfaces/efl_ui_i18n.eo similarity index 91% rename from src/lib/efl/interfaces/efl_ui_base.eo rename to src/lib/efl/interfaces/efl_ui_i18n.eo index 646b31be99..3dffa16c1e 100644 --- a/src/lib/efl/interfaces/efl_ui_base.eo +++ b/src/lib/efl/interfaces/efl_ui_i18n.eo @@ -1,7 +1,6 @@ -/* FIXME: Any better name? Efl.Ui? Efl.Ui.Common? */ -interface Efl.Ui.Base +interface Efl.Ui.I18n { - [[A common interface for UI objects.]] + [[A common Internationalization interface for UI objects.]] eo_prefix: efl_ui; methods { @property mirrored { diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build index bcd9b22bba..c263b05b70 100644 --- a/src/lib/efl/interfaces/meson.build +++ b/src/lib/efl/interfaces/meson.build @@ -81,7 +81,7 @@ pub_eo_files = [ 'efl_pack_layout.eo', 'efl_pack_linear.eo', 'efl_pack_table.eo', - 'efl_ui_base.eo', + 'efl_ui_i18n.eo', 'efl_ui_direction.eo', 'efl_ui_drag.eo', 'efl_ui_range.eo', diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c index 06d33235a5..8351c8972e 100644 --- a/src/lib/elementary/efl_ui_panel.c +++ b/src/lib/elementary/efl_ui_panel.c @@ -1360,7 +1360,7 @@ _efl_ui_panel_scrollable_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool scrollabl } EOLIAN static void -_efl_ui_panel_efl_ui_base_mirrored_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool mirrored) +_efl_ui_panel_efl_ui_i18n_mirrored_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool mirrored) { if (sd->scrollable) efl_ui_mirrored_set(efl_cast(obj, ELM_INTERFACE_SCROLLABLE_MIXIN), mirrored); diff --git a/src/lib/elementary/efl_ui_panel.eo b/src/lib/elementary/efl_ui_panel.eo index 8fb5c1d359..da285179b0 100644 --- a/src/lib/elementary/efl_ui_panel.eo +++ b/src/lib/elementary/efl_ui_panel.eo @@ -85,7 +85,7 @@ class Efl.Ui.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Ui.Widget.widget_event; Efl.Ui.Widget.interest_region { get; } Efl.Access.Widget.Action.elm_actions { get; } - Efl.Ui.Base.mirrored { set; } + Efl.Ui.I18n.mirrored { set; } Efl.Content.content { get; set; } Efl.Content.content_unset; } diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c index 4b35cf8abd..ee10d895ab 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.c +++ b/src/lib/elementary/efl_ui_scroll_manager.c @@ -519,7 +519,7 @@ _efl_ui_scroll_manager_efl_ui_scrollable_interactive_content_pos_set(Eo *obj EIN } EOLIAN static void -_efl_ui_scroll_manager_efl_ui_base_mirrored_set(Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Manager_Data *sd, Eina_Bool mirrored) +_efl_ui_scroll_manager_efl_ui_i18n_mirrored_set(Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Manager_Data *sd, Eina_Bool mirrored) { Evas_Coord wx; diff --git a/src/lib/elementary/efl_ui_scroll_manager.eo b/src/lib/elementary/efl_ui_scroll_manager.eo index d0c59ce340..90cab824fe 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.eo +++ b/src/lib/elementary/efl_ui_scroll_manager.eo @@ -1,5 +1,5 @@ class Efl.Ui.Scroll.Manager (Efl.Object, - Efl.Ui.Base, + Efl.Ui.I18n, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar) { @@ -24,7 +24,7 @@ class Efl.Ui.Scroll.Manager (Efl.Object, implements { Efl.Object.constructor; Efl.Object.destructor; - Efl.Ui.Base.mirrored { set; } + Efl.Ui.I18n.mirrored { set; } Efl.Ui.Scrollable_Interactive.content_pos { set; get; } Efl.Ui.Scrollable_Interactive.content_size{ get; } Efl.Ui.Scrollable_Interactive.viewport_geometry{ get; } diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index ecc9b5f2c0..431e66b437 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -1355,7 +1355,7 @@ _efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) * **/ EOLIAN static Eina_Bool -_efl_ui_widget_efl_ui_base_mirrored_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_ui_i18n_mirrored_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->is_mirrored; } @@ -1369,7 +1369,7 @@ _efl_ui_widget_efl_ui_base_mirrored_get(const Eo *obj EINA_UNUSED, Elm_Widget_Sm * @param mirrored EINA_TRUE to set mirrored mode. EINA_FALSE to unset. */ EOLIAN static void -_efl_ui_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored) +_efl_ui_widget_efl_ui_i18n_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored) { mirrored = !!mirrored; @@ -1387,7 +1387,7 @@ _efl_ui_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina * **/ EOLIAN static Eina_Bool -_efl_ui_widget_efl_ui_base_mirrored_automatic_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_ui_i18n_mirrored_automatic_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->mirrored_auto_mode; } @@ -1402,7 +1402,7 @@ _efl_ui_widget_efl_ui_base_mirrored_automatic_get(const Eo *obj EINA_UNUSED, Elm * @param automatic EINA_TRUE for auto mirrored mode. EINA_FALSE for manual. */ EOLIAN static void -_efl_ui_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) +_efl_ui_widget_efl_ui_i18n_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) { if (sd->mirrored_auto_mode != automatic) { diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index d1d215aec2..ca6fca818c 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -583,8 +583,8 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object, Efl.Ui.Focus.Object.focus_parent { get; } Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } - Efl.Ui.Base.mirrored { get; set; } - Efl.Ui.Base.mirrored_automatic { get; set; } + Efl.Ui.I18n.mirrored { get; set; } + Efl.Ui.I18n.mirrored_automatic { get; set; } Efl.Ui.Cursor.cursor { get; set; } Efl.Ui.Cursor.cursor_style { get; set; } Efl.Ui.Cursor.cursor_theme_search_enabled { get; set; } diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 0e666236fc..ccd0df348d 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -1776,7 +1776,7 @@ _elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Scrollable_Smart_Interfac } EOLIAN static void -_elm_interface_scrollable_efl_ui_base_mirrored_set(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool mirrored) +_elm_interface_scrollable_efl_ui_i18n_mirrored_set(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool mirrored) { Evas_Coord wx; diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo index 02c2739953..f95ce04806 100644 --- a/src/lib/elementary/elm_interface_scrollable.eo +++ b/src/lib/elementary/elm_interface_scrollable.eo @@ -660,7 +660,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager_Sub, Efl. Efl.Object.constructor; Efl.Ui.Focus.Manager.border_elements { get; } Efl.Ui.Widget_Focus_Manager.focus_manager_create; - Efl.Ui.Base.mirrored { set; } + Efl.Ui.I18n.mirrored { set; } } events { changed: void; [[Called when content changed]] diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 9c908ae944..204dc2e89a 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1441,7 +1441,7 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) } EOLIAN static void -_elm_panel_efl_ui_base_mirrored_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool mirrored) +_elm_panel_efl_ui_i18n_mirrored_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool mirrored) { if (sd->scrollable) efl_ui_mirrored_set(efl_cast(obj, ELM_INTERFACE_SCROLLABLE_MIXIN), mirrored); diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index d4fe178821..d2d185afdf 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -85,7 +85,7 @@ class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Ui.Widget.widget_event; Efl.Ui.Widget.interest_region { get; } Efl.Access.Widget.Action.elm_actions { get; } - Efl.Ui.Base.mirrored { set; } + Efl.Ui.I18n.mirrored { set; } Efl.Part.part_get; } events { diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index 10a25b5756..14dfa3e61a 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -4,7 +4,7 @@ struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]] abstract Efl.Canvas.Object (Efl.Loop_Consumer, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, Efl.Input.Interface, Efl.Gfx.Size_Hint, - Efl.Gfx.Map, Efl.Ui.Base, Efl.Canvas.Pointer) + Efl.Gfx.Map, Efl.Ui.I18n, Efl.Canvas.Pointer) { [[Efl canvas object abstract class]] legacy_prefix: evas_object; diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo index 3c18c32010..4e9b822350 100644 --- a/src/lib/evas/canvas/efl_canvas_text.eo +++ b/src/lib/evas/canvas/efl_canvas_text.eo @@ -5,7 +5,7 @@ struct Efl.Canvas.Text_Style; [[EFL text style data structure]] class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Canvas.Filter.Internal, Efl.Text_Font, Efl.Text_Style, Efl.Text_Format, Efl.Text_Cursor, - Efl.Text_Annotate, Efl.Text_Markup, Efl.Ui.Base) + Efl.Text_Annotate, Efl.Text_Markup, Efl.Ui.I18n) { [[Efl canvas text class]] legacy_prefix: evas_object_textblock; diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo index f1b32c7945..1d5f1051b2 100644 --- a/src/lib/evas/canvas/evas_grid.eo +++ b/src/lib/evas/canvas/evas_grid.eo @@ -118,6 +118,6 @@ class Evas.Grid (Efl.Canvas.Group) } implements { Efl.Object.constructor; - Efl.Ui.Base.mirrored {get; set;} + Efl.Ui.I18n.mirrored {get; set;} } } diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 75c50b9546..9fb909afc0 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -479,13 +479,13 @@ _evas_grid_children_get(const Eo *o EINA_UNUSED, Evas_Grid_Data *priv) } EOLIAN static Eina_Bool -_evas_grid_efl_ui_base_mirrored_get(const Eo *o EINA_UNUSED, Evas_Grid_Data *priv) +_evas_grid_efl_ui_i18n_mirrored_get(const Eo *o EINA_UNUSED, Evas_Grid_Data *priv) { return priv->is_mirrored; } EOLIAN static void -_evas_grid_efl_ui_base_mirrored_set(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, Eina_Bool mirrored) +_evas_grid_efl_ui_i18n_mirrored_set(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, Eina_Bool mirrored) { mirrored = !!mirrored; if (priv->is_mirrored != mirrored) diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index bd694d9611..a735655eb6 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -1417,7 +1417,7 @@ _evas_table_child_get(const Eo *o EINA_UNUSED, Evas_Table_Data *priv, unsigned s } EOLIAN static Eina_Bool -_evas_table_efl_ui_base_mirrored_get(const Eo *o EINA_UNUSED, Evas_Table_Data *priv) +_evas_table_efl_ui_i18n_mirrored_get(const Eo *o EINA_UNUSED, Evas_Table_Data *priv) { return priv->is_mirrored; } @@ -1429,7 +1429,7 @@ evas_object_table_mirrored_get(const Eo *obj) } EOLIAN static void -_evas_table_efl_ui_base_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored) +_evas_table_efl_ui_i18n_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored) { if (priv->is_mirrored != mirrored) { diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index 3c7acdb156..9a4d770c8f 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -206,6 +206,6 @@ class Evas.Table (Efl.Canvas.Group) Efl.Gfx.Entity.size { set; } Efl.Gfx.Entity.position { set; } Efl.Canvas.Group.group_calculate; - Efl.Ui.Base.mirrored { get; set; } + Efl.Ui.I18n.mirrored { get; set; } } }