summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-07 13:53:18 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-14 12:25:58 +0200
commit80bf4ace914077ff3987bef56be2aea55aad9edc (patch)
tree1277dd0500b290a04ccb0a0d3c8b9c5c7e8fcbd2
parentf526ad8c26aef17ff1af444217d065d33ba2387a (diff)
efl_input_text: rename namespace
Efl.Input_Text is a namespace which should not be a interface in the same moment. So rename this to Efl.Input_Text.Entity ref T8648 Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D11664
-rw-r--r--src/lib/efl/Efl.h2
-rw-r--r--src/lib/efl/interfaces/efl_input_text_entity.eo (renamed from src/lib/efl/interfaces/efl_input_text.eo)5
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/meson.build2
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c48
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.eo28
-rw-r--r--src/lib/elementary/efl_ui_textbox.eo2
7 files changed, 45 insertions, 44 deletions
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index ec6f168a8b..021bc5eb37 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -213,7 +213,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
213#include "interfaces/efl_text_format.eo.h" 213#include "interfaces/efl_text_format.eo.h"
214#include "interfaces/efl_text_markup.eo.h" 214#include "interfaces/efl_text_markup.eo.h"
215#include "interfaces/efl_text_markup_util.eo.h" 215#include "interfaces/efl_text_markup_util.eo.h"
216#include "interfaces/efl_input_text.eo.h" 216#include "interfaces/efl_input_text_entity.eo.h"
217 217
218/** 218/**
219 * @brief Get a proxy object referring to a part of an object. 219 * @brief Get a proxy object referring to a part of an object.
diff --git a/src/lib/efl/interfaces/efl_input_text.eo b/src/lib/efl/interfaces/efl_input_text_entity.eo
index 4abcdf7c34..75144fd275 100644
--- a/src/lib/efl/interfaces/efl_input_text.eo
+++ b/src/lib/efl/interfaces/efl_input_text_entity.eo
@@ -95,7 +95,7 @@ enum @beta Efl.Input_Text.Panel_Layout_Normal_Variation_Type
95 [[Enumeration for defining the types of @Efl.Input_Text.Panel_Layout_Type for normal variation.]] 95 [[Enumeration for defining the types of @Efl.Input_Text.Panel_Layout_Type for normal variation.]]
96 normal , [[The plain normal layout.]] 96 normal , [[The plain normal layout.]]
97 file_name , [[Filename layout. Symbols such as '/' should be disabled.]] 97 file_name , [[Filename layout. Symbols such as '/' should be disabled.]]
98 person_name , [[The name of a person, @Efl.Input_Text.autocapitalization will be set to @Efl.Input_Text.Capitalize_Type.word.]] 98 person_name , [[The name of a person, @Efl.Input_Text.Entity.autocapitalization will be set to @Efl.Input_Text.Capitalize_Type.word.]]
99} 99}
100 100
101enum @beta Efl.Input_Text.Panel_Layout_Numberonly_Variation_Type 101enum @beta Efl.Input_Text.Panel_Layout_Numberonly_Variation_Type
@@ -116,10 +116,11 @@ enum @beta Efl.Input_Text.Panel_Layout_Password_Variation_Type
116 116
117 117
118 118
119interface Efl.Input_Text { 119interface Efl.Input_Text.Entity {
120 [[All the functionality relating to input hints/ 120 [[All the functionality relating to input hints/
121 @since 1.24 121 @since 1.24
122 ]] 122 ]]
123 c_prefix: efl_input_text;
123 methods { 124 methods {
124 @property input_panel_show_on_demand { 125 @property input_panel_show_on_demand {
125 [[Set/Get the attribute to show the input panel in case of only a user's explicit Mouse Up event. 126 [[Set/Get the attribute to show the input panel in case of only a user's explicit Mouse Up event.
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index d7fab5fcf8..4856df5a6e 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -25,7 +25,7 @@
25#include "interfaces/efl_text_style.eo.c" 25#include "interfaces/efl_text_style.eo.c"
26#include "interfaces/efl_text_format.eo.c" 26#include "interfaces/efl_text_format.eo.c"
27#include "interfaces/efl_text_markup.eo.c" 27#include "interfaces/efl_text_markup.eo.c"
28#include "interfaces/efl_input_text.eo.c" 28#include "interfaces/efl_input_text_entity.eo.c"
29 29
30#include "interfaces/efl_gfx_entity.eo.c" 30#include "interfaces/efl_gfx_entity.eo.c"
31#include "interfaces/efl_gfx_buffer.eo.c" 31#include "interfaces/efl_gfx_buffer.eo.c"
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 76e9fb5d07..0b1bdd4556 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -93,7 +93,7 @@ pub_eo_files = [
93 'efl_gfx_text_class.eo', 93 'efl_gfx_text_class.eo',
94 'efl_gfx_size_class.eo', 94 'efl_gfx_size_class.eo',
95 'efl_cached_item.eo', 95 'efl_cached_item.eo',
96 'efl_input_text.eo', 96 'efl_input_text_entity.eo',
97] 97]
98 98
99foreach eo_file : pub_eo_files 99foreach eo_file : pub_eo_files
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index b042f8e305..34069a3ad6 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -1992,7 +1992,7 @@ _efl_ui_internal_text_interactive_efl_text_interactive_editable_get(const Eo *ob
1992} 1992}
1993 1993
1994EOLIAN static void 1994EOLIAN static void
1995_efl_ui_internal_text_interactive_efl_input_text_input_panel_hide(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 1995_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_hide(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
1996{ 1996{
1997#ifdef HAVE_ECORE_IMF 1997#ifdef HAVE_ECORE_IMF
1998 if (en->imf_context) 1998 if (en->imf_context)
@@ -2004,7 +2004,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_hide(Eo *obj EINA_U
2004 2004
2005 2005
2006EOLIAN static void 2006EOLIAN static void
2007_efl_ui_internal_text_interactive_efl_input_text_input_panel_language_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Language_Type lang) 2007_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_language_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Language_Type lang)
2008{ 2008{
2009 en->input_panel_lang = lang; 2009 en->input_panel_lang = lang;
2010#ifdef HAVE_ECORE_IMF 2010#ifdef HAVE_ECORE_IMF
@@ -2018,14 +2018,14 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_language_set(Eo *ob
2018 2018
2019 2019
2020EOLIAN static Efl_Input_Text_Panel_Language_Type 2020EOLIAN static Efl_Input_Text_Panel_Language_Type
2021_efl_ui_internal_text_interactive_efl_input_text_input_panel_language_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2021_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_language_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2022{ 2022{
2023 return en->input_panel_lang; 2023 return en->input_panel_lang;
2024} 2024}
2025 2025
2026 2026
2027EOLIAN static void 2027EOLIAN static void
2028_efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Slice slice) 2028_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_imdata_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Slice slice)
2029{ 2029{
2030#ifdef HAVE_ECORE_IMF 2030#ifdef HAVE_ECORE_IMF
2031 if (en->imf_context) 2031 if (en->imf_context)
@@ -2039,7 +2039,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_set(Eo *obj
2039 2039
2040 2040
2041EOLIAN static Eina_Slice 2041EOLIAN static Eina_Slice
2042_efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2042_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_imdata_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2043{ 2043{
2044 Eina_Slice slice = {0}; 2044 Eina_Slice slice = {0};
2045 2045
@@ -2060,7 +2060,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_imdata_get(const Eo
2060 2060
2061 2061
2062EOLIAN static void 2062EOLIAN static void
2063_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_Type return_key_type) 2063_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_Type return_key_type)
2064{ 2064{
2065#ifdef HAVE_ECORE_IMF 2065#ifdef HAVE_ECORE_IMF
2066 if (en->imf_context) 2066 if (en->imf_context)
@@ -2073,7 +2073,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_set
2073 2073
2074 2074
2075EOLIAN static Efl_Input_Text_Panel_Return_Key_Type 2075EOLIAN static Efl_Input_Text_Panel_Return_Key_Type
2076_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2076_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2077{ 2077{
2078#ifdef HAVE_ECORE_IMF 2078#ifdef HAVE_ECORE_IMF
2079 if (en->imf_context) 2079 if (en->imf_context)
@@ -2086,7 +2086,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_type_get
2086} 2086}
2087 2087
2088EOLIAN static void 2088EOLIAN static void
2089_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_state_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_State state) 2089_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_state_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Panel_Return_Key_State state)
2090{ 2090{
2091 if (en->input_panel_return_key_state == state) 2091 if (en->input_panel_return_key_state == state)
2092 return; 2092 return;
@@ -2120,14 +2120,14 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_state_se
2120 2120
2121 2121
2122EOLIAN static Efl_Input_Text_Panel_Return_Key_State 2122EOLIAN static Efl_Input_Text_Panel_Return_Key_State
2123_efl_ui_internal_text_interactive_efl_input_text_input_panel_return_key_state_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2123_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_return_key_state_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2124{ 2124{
2125 return en->input_panel_return_key_state; 2125 return en->input_panel_return_key_state;
2126} 2126}
2127 2127
2128 2128
2129EOLIAN static void 2129EOLIAN static void
2130_efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool ondemand) 2130_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool ondemand)
2131{ 2131{
2132#ifdef HAVE_ECORE_IMF 2132#ifdef HAVE_ECORE_IMF
2133 if (en->imf_context) 2133 if (en->imf_context)
@@ -2139,7 +2139,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_set(
2139} 2139}
2140 2140
2141EOLIAN static void 2141EOLIAN static void
2142_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, Efl_Input_Text_Panel_Layout_Type layout) 2142_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, Efl_Input_Text_Panel_Layout_Type layout)
2143{ 2143{
2144 sd->input_panel_layout = layout; 2144 sd->input_panel_layout = layout;
2145 2145
@@ -2155,13 +2155,13 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_set(Eo *obj
2155} 2155}
2156 2156
2157EOLIAN static Efl_Input_Text_Panel_Layout_Type 2157EOLIAN static Efl_Input_Text_Panel_Layout_Type
2158_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd) 2158_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
2159{ 2159{
2160 return sd->input_panel_layout; 2160 return sd->input_panel_layout;
2161} 2161}
2162 2162
2163EOLIAN static void 2163EOLIAN static void
2164_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, int variation) 2164_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, int variation)
2165{ 2165{
2166 sd->input_panel_layout_variation = variation; 2166 sd->input_panel_layout_variation = variation;
2167 2167
@@ -2178,13 +2178,13 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_variation_se
2178} 2178}
2179 2179
2180EOLIAN static int 2180EOLIAN static int
2181_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_variation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd) 2181_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_layout_variation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
2182{ 2182{
2183 return sd->input_panel_layout_variation; 2183 return sd->input_panel_layout_variation;
2184} 2184}
2185 2185
2186EOLIAN static void 2186EOLIAN static void
2187_efl_ui_internal_text_interactive_efl_input_text_input_panel_show(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2187_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_show(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2188{ 2188{
2189#ifdef HAVE_ECORE_IMF 2189#ifdef HAVE_ECORE_IMF
2190 if (en->imf_context) 2190 if (en->imf_context)
@@ -2195,7 +2195,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_show(Eo *obj EINA_U
2195} 2195}
2196 2196
2197EOLIAN static void 2197EOLIAN static void
2198_efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool enabled) 2198_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_autoshow_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool enabled)
2199{ 2199{
2200#ifdef HAVE_ECORE_IMF 2200#ifdef HAVE_ECORE_IMF
2201 if (en->imf_context) 2201 if (en->imf_context)
@@ -2207,7 +2207,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_set(Eo *ob
2207} 2207}
2208 2208
2209EOLIAN static Eina_Bool 2209EOLIAN static Eina_Bool
2210_efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2210_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_autoshow_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2211{ 2211{
2212#ifdef HAVE_ECORE_IMF 2212#ifdef HAVE_ECORE_IMF
2213 if (en->imf_context) 2213 if (en->imf_context)
@@ -2219,7 +2219,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_autoshow_get(const
2219} 2219}
2220 2220
2221EOLIAN static Eina_Bool 2221EOLIAN static Eina_Bool
2222_efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2222_efl_ui_internal_text_interactive_efl_input_text_entity_input_panel_show_on_demand_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2223{ 2223{
2224#ifdef HAVE_ECORE_IMF 2224#ifdef HAVE_ECORE_IMF
2225 if (en->imf_context) 2225 if (en->imf_context)
@@ -2235,7 +2235,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_show_on_demand_get(
2235 2235
2236 2236
2237EOLIAN static void 2237EOLIAN static void
2238_efl_ui_internal_text_interactive_efl_input_text_predictable_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool prediction) 2238_efl_ui_internal_text_interactive_efl_input_text_entity_predictable_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool prediction)
2239{ 2239{
2240 en->prediction_allow = prediction; 2240 en->prediction_allow = prediction;
2241#ifdef HAVE_ECORE_IMF 2241#ifdef HAVE_ECORE_IMF
@@ -2249,14 +2249,14 @@ _efl_ui_internal_text_interactive_efl_input_text_predictable_set(Eo *obj EINA_UN
2249 2249
2250 2250
2251EOLIAN static Eina_Bool 2251EOLIAN static Eina_Bool
2252_efl_ui_internal_text_interactive_efl_input_text_predictable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2252_efl_ui_internal_text_interactive_efl_input_text_entity_predictable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2253{ 2253{
2254 return en->prediction_allow; 2254 return en->prediction_allow;
2255} 2255}
2256 2256
2257 2257
2258EOLIAN static void 2258EOLIAN static void
2259_efl_ui_internal_text_interactive_efl_input_text_input_content_type_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Content_Type input_hints) 2259_efl_ui_internal_text_interactive_efl_input_text_entity_input_content_type_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Content_Type input_hints)
2260{ 2260{
2261#ifdef HAVE_ECORE_IMF 2261#ifdef HAVE_ECORE_IMF
2262 if (en->imf_context) 2262 if (en->imf_context)
@@ -2271,7 +2271,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_content_type_set(Eo *obj,
2271 2271
2272 2272
2273EOLIAN static Efl_Input_Text_Content_Type 2273EOLIAN static Efl_Input_Text_Content_Type
2274_efl_ui_internal_text_interactive_efl_input_text_input_content_type_get(const Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en) 2274_efl_ui_internal_text_interactive_efl_input_text_entity_input_content_type_get(const Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
2275{ 2275{
2276#ifdef HAVE_ECORE_IMF 2276#ifdef HAVE_ECORE_IMF
2277 if (en->imf_context) 2277 if (en->imf_context)
@@ -2287,7 +2287,7 @@ _efl_ui_internal_text_interactive_efl_input_text_input_content_type_get(const Eo
2287 2287
2288 2288
2289EOLIAN static void 2289EOLIAN static void
2290_efl_ui_internal_text_interactive_efl_input_text_autocapitalization_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Capitalize_Type autocapital_type) 2290_efl_ui_internal_text_interactive_efl_input_text_entity_autocapitalization_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Capitalize_Type autocapital_type)
2291{ 2291{
2292#ifdef HAVE_ECORE_IMF 2292#ifdef HAVE_ECORE_IMF
2293 if (efl_text_password_get(obj) == EINA_TRUE) 2293 if (efl_text_password_get(obj) == EINA_TRUE)
@@ -2304,7 +2304,7 @@ _efl_ui_internal_text_interactive_efl_input_text_autocapitalization_set(Eo *obj,
2304 2304
2305 2305
2306EOLIAN static Efl_Input_Text_Capitalize_Type 2306EOLIAN static Efl_Input_Text_Capitalize_Type
2307_efl_ui_internal_text_interactive_efl_input_text_autocapitalization_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 2307_efl_ui_internal_text_interactive_efl_input_text_entity_autocapitalization_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
2308{ 2308{
2309#ifdef HAVE_ECORE_IMF 2309#ifdef HAVE_ECORE_IMF
2310 if (en->imf_context) 2310 if (en->imf_context)
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index ebe694b006..7a9174822e 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive, Efl.Input_Text, Efl.File 1class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive, Efl.Input_Text.Entity, Efl.File
2{ 2{
3 [[An internal object in charge of the interactive aspect of the text widget. 3 [[An internal object in charge of the interactive aspect of the text widget.
4 4
@@ -17,19 +17,19 @@ class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implem
17 Efl.Text_Interactive.have_selection {get; } 17 Efl.Text_Interactive.have_selection {get; }
18 Efl.Text.text { set; } 18 Efl.Text.text { set; }
19 Efl.Text_Markup.markup { set; } 19 Efl.Text_Markup.markup { set; }
20 Efl.Input_Text.input_panel_show_on_demand { get; set; } 20 Efl.Input_Text.Entity.input_panel_show_on_demand { get; set; }
21 Efl.Input_Text.input_panel_language { get; set; } 21 Efl.Input_Text.Entity.input_panel_language { get; set; }
22 Efl.Input_Text.input_panel_layout_variation { get; set; } 22 Efl.Input_Text.Entity.input_panel_layout_variation { get; set; }
23 Efl.Input_Text.autocapitalization { get; set; } 23 Efl.Input_Text.Entity.autocapitalization { get; set; }
24 Efl.Input_Text.input_panel_return_key_state { get; set; } 24 Efl.Input_Text.Entity.input_panel_return_key_state { get; set; }
25 Efl.Input_Text.predictable { get; set; } 25 Efl.Input_Text.Entity.predictable { get; set; }
26 Efl.Input_Text.input_content_type { get; set; } 26 Efl.Input_Text.Entity.input_content_type { get; set; }
27 Efl.Input_Text.input_panel_layout { get; set; } 27 Efl.Input_Text.Entity.input_panel_layout { get; set; }
28 Efl.Input_Text.input_panel_return_key_type { get; set; } 28 Efl.Input_Text.Entity.input_panel_return_key_type { get; set; }
29 Efl.Input_Text.input_panel_autoshow { get; set; } 29 Efl.Input_Text.Entity.input_panel_autoshow { get; set; }
30 Efl.Input_Text.input_panel_show; 30 Efl.Input_Text.Entity.input_panel_show;
31 Efl.Input_Text.input_panel_hide; 31 Efl.Input_Text.Entity.input_panel_hide;
32 Efl.Input_Text.input_panel_imdata { get; set; } 32 Efl.Input_Text.Entity.input_panel_imdata { get; set; }
33 //FIXME Efl.File should be implemented later at Efl.Ui.TextBox level 33 //FIXME Efl.File should be implemented later at Efl.Ui.TextBox level
34 Efl.File.file { set; } 34 Efl.File.file { set; }
35 Efl.File.load; 35 Efl.File.load;
diff --git a/src/lib/elementary/efl_ui_textbox.eo b/src/lib/elementary/efl_ui_textbox.eo
index 304a6e82ee..9cd5c520b5 100644
--- a/src/lib/elementary/efl_ui_textbox.eo
+++ b/src/lib/elementary/efl_ui_textbox.eo
@@ -13,7 +13,7 @@ enum @beta Efl.Ui.Textbox_Cnp_Content {
13class Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, 13class Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
14 Efl.Access.Text, Efl.Access.Editable.Text, Efl.Ui.Scrollable 14 Efl.Access.Text, Efl.Access.Editable.Text, Efl.Ui.Scrollable
15 composites 15 composites
16 Efl.Text_Interactive, Efl.Text_Markup, Efl.Input_Text 16 Efl.Text_Interactive, Efl.Text_Markup, Efl.Input_Text.Entity
17{ 17{
18 [[A flexible text widget which can be static (as a label) or editable by 18 [[A flexible text widget which can be static (as a label) or editable by
19 the user (as a text entry). It provides all sorts of editing facilities 19 the user (as a text entry). It provides all sorts of editing facilities