summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-01-02 11:53:26 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-01-02 11:53:26 +0000
commit361b7ea0062b77abe3228fa29c2c9c4b44fe5363 (patch)
treecaadeaab79ec3b60008b6150c045082eed362bde /src
parent6db2dad09c58fe1a9bc853a9428ab2ae229cbb09 (diff)
get rid of invalid panel layout and add hex and terminal.
SVN revision: 66749
Diffstat (limited to 'src')
-rw-r--r--src/lib/elm_entry.c4
-rw-r--r--src/lib/elm_entry.h116
2 files changed, 63 insertions, 57 deletions
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 595166b7f..25a511db9 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3431,9 +3431,9 @@ elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout
3431EAPI Elm_Input_Panel_Layout 3431EAPI Elm_Input_Panel_Layout
3432elm_entry_input_panel_layout_get(Evas_Object *obj) 3432elm_entry_input_panel_layout_get(Evas_Object *obj)
3433{ 3433{
3434 ELM_CHECK_WIDTYPE(obj, widtype) ELM_INPUT_PANEL_LAYOUT_INVALID; 3434 ELM_CHECK_WIDTYPE(obj, widtype) ELM_INPUT_PANEL_LAYOUT_NORMAL;
3435 Widget_Data *wd = elm_widget_data_get(obj); 3435 Widget_Data *wd = elm_widget_data_get(obj);
3436 if (!wd) return ELM_INPUT_PANEL_LAYOUT_INVALID; 3436 if (!wd) return ELM_INPUT_PANEL_LAYOUT_NORMAL;
3437 3437
3438 return wd->input_panel_layout; 3438 return wd->input_panel_layout;
3439} 3439}
diff --git a/src/lib/elm_entry.h b/src/lib/elm_entry.h
index 6c814a9fc..8c9829f67 100644
--- a/src/lib/elm_entry.h
+++ b/src/lib/elm_entry.h
@@ -26,8 +26,9 @@ typedef enum
26 ELM_INPUT_PANEL_LAYOUT_IP, /**< IP layout */ 26 ELM_INPUT_PANEL_LAYOUT_IP, /**< IP layout */
27 ELM_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */ 27 ELM_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */
28 ELM_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */ 28 ELM_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */
29 ELM_INPUT_PANEL_LAYOUT_INVALID // XXX: remove this so we can expand 29 ELM_INPUT_PANEL_LAYOUT_HEX, /**< Hexadecimal layout */
30} Elm_Input_Panel_Layout; /**< Type of input panel (virtual keyboard) to use */ 30 ELM_INPUT_PANEL_LAYOUT_TERMINAL, /**< Command-line terminal layout */
31} Elm_Input_Panel_Layout; /**< Type of input panel (virtual keyboard) to use - this is a hint and may not provide exactly what is desired. */
31 32
32typedef enum 33typedef enum
33{ 34{
@@ -871,8 +872,7 @@ EAPI void elm_entry_text_filter_remove(Evas_Object *obj, Elm_Entry
871 * @param s The string (in markup) to be converted 872 * @param s The string (in markup) to be converted
872 * @return The converted string (in UTF-8). It should be freed. 873 * @return The converted string (in UTF-8). It should be freed.
873 */ 874 */
874EAPI char *elm_entry_markup_to_utf8(const char *s) 875EAPI char *elm_entry_markup_to_utf8(const char *s);
875EINA_MALLOC EINA_WARN_UNUSED_RESULT;
876 876
877/** 877/**
878 * This converts a UTF-8 string into markup (HTML-like). 878 * This converts a UTF-8 string into markup (HTML-like).
@@ -883,8 +883,7 @@ EINA_MALLOC EINA_WARN_UNUSED_RESULT;
883 * @param s The string (in UTF-8) to be converted 883 * @param s The string (in UTF-8) to be converted
884 * @return The converted string (in markup). It should be freed. 884 * @return The converted string (in markup). It should be freed.
885 */ 885 */
886EAPI char *elm_entry_utf8_to_markup(const char *s) 886EAPI char *elm_entry_utf8_to_markup(const char *s);
887EINA_MALLOC EINA_WARN_UNUSED_RESULT;
888 887
889/** 888/**
890 * This sets the file (and implicitly loads it) for the text to display and 889 * This sets the file (and implicitly loads it) for the text to display and
@@ -1008,6 +1007,7 @@ EAPI void elm_entry_icon_set(Evas_Object *obj, Evas_Object *icon);
1008 * @param obj The scrolled entry object 1007 * @param obj The scrolled entry object
1009 * @return the left widget inside the scroller 1008 * @return the left widget inside the scroller
1010 */ 1009 */
1010// XXX: deprecate - used elm_object_content_set()
1011EAPI Evas_Object *elm_entry_icon_get(const Evas_Object *obj); 1011EAPI Evas_Object *elm_entry_icon_get(const Evas_Object *obj);
1012 1012
1013/** 1013/**
@@ -1020,6 +1020,7 @@ EAPI Evas_Object *elm_entry_icon_get(const Evas_Object *obj);
1020 * 1020 *
1021 * @see elm_entry_icon_set() 1021 * @see elm_entry_icon_set()
1022 */ 1022 */
1023// XXX: deprecate - used elm_object_content_set()
1023EAPI Evas_Object *elm_entry_icon_unset(Evas_Object *obj); 1024EAPI Evas_Object *elm_entry_icon_unset(Evas_Object *obj);
1024 1025
1025/** 1026/**
@@ -1045,6 +1046,7 @@ EAPI void elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool s
1045 * 1046 *
1046 * @see elm_entry_icon_set 1047 * @see elm_entry_icon_set
1047 */ 1048 */
1049// XXX: deprecate - used elm_object_content_set()
1048EAPI void elm_entry_end_set(Evas_Object *obj, Evas_Object *end); 1050EAPI void elm_entry_end_set(Evas_Object *obj, Evas_Object *end);
1049 1051
1050/** 1052/**
@@ -1054,6 +1056,7 @@ EAPI void elm_entry_end_set(Evas_Object *obj, Evas_Object *end);
1054 * @param obj The scrolled entry object 1056 * @param obj The scrolled entry object
1055 * @return the right widget inside the scroller 1057 * @return the right widget inside the scroller
1056 */ 1058 */
1059// XXX: deprecate - used elm_object_content_set()
1057EAPI Evas_Object *elm_entry_end_get(const Evas_Object *obj); 1060EAPI Evas_Object *elm_entry_end_get(const Evas_Object *obj);
1058 1061
1059/** 1062/**
@@ -1066,6 +1069,7 @@ EAPI Evas_Object *elm_entry_end_get(const Evas_Object *obj);
1066 * 1069 *
1067 * @see elm_entry_icon_set() 1070 * @see elm_entry_icon_set()
1068 */ 1071 */
1072// XXX: deprecate - used elm_object_content_set()
1069EAPI Evas_Object *elm_entry_end_unset(Evas_Object *obj); 1073EAPI Evas_Object *elm_entry_end_unset(Evas_Object *obj);
1070 1074
1071/** 1075/**
@@ -1113,7 +1117,58 @@ EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounc
1113 */ 1117 */
1114EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); 1118EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
1115 1119
1120/**
1121 * Set the input panel layout of the entry
1122 *
1123 * @param obj The entry object
1124 * @param layout layout type
1125 */
1126EAPI void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout);
1127
1128/**
1129 * Get the input panel layout of the entry
1130 *
1131 * @param obj The entry object
1132 * @return layout type
1133 *
1134 * @see elm_entry_input_panel_layout_set
1135 */
1136EAPI Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(Evas_Object *obj);
1137
1138/**
1139 * Set the autocapitalization type on the immodule.
1140 *
1141 * @param obj The entry object
1142 * @param autocapital_type The type of autocapitalization
1143 */
1144EAPI void elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type);
1145
1146/**
1147 * Retrieve the autocapitalization type on the immodule.
1148 *
1149 * @param obj The entry object
1150 * @return autocapitalization type
1151 */
1152EAPI Elm_Autocapital_Type elm_entry_autocapital_type_get(Evas_Object *obj);
1153
1154/**
1155 * Sets the attribute to show the input panel automatically.
1156 *
1157 * @param obj The entry object
1158 * @param enabled If true, the input panel is appeared when entry is clicked or has a focus
1159 */
1160EAPI void elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled);
1161
1162/**
1163 * Retrieve the attribute to show the input panel automatically.
1164 *
1165 * @param obj The entry object
1166 * @return EINA_TRUE if input panel will be appeared when the entry is clicked or has a focus, EINA_FALSE otherwise
1167 */
1168EAPI Eina_Bool elm_entry_input_panel_enabled_get(Evas_Object *obj);
1169
1116/* pre-made filters for entries */ 1170/* pre-made filters for entries */
1171
1117/** 1172/**
1118 * @typedef Elm_Entry_Filter_Limit_Size 1173 * @typedef Elm_Entry_Filter_Limit_Size
1119 * 1174 *
@@ -1193,55 +1248,6 @@ struct _Elm_Entry_Filter_Accept_Set
1193 * directly with elm_object_text_set() 1248 * directly with elm_object_text_set()
1194 */ 1249 */
1195EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text); 1250EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text);
1196/**
1197 * Set the input panel layout of the entry
1198 *
1199 * @param obj The entry object
1200 * @param layout layout type
1201 */
1202EAPI void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout);
1203
1204/**
1205 * Get the input panel layout of the entry
1206 *
1207 * @param obj The entry object
1208 * @return layout type
1209 *
1210 * @see elm_entry_input_panel_layout_set
1211 */
1212EAPI Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(Evas_Object *obj);
1213
1214/**
1215 * Set the autocapitalization type on the immodule.
1216 *
1217 * @param obj The entry object
1218 * @param autocapital_type The type of autocapitalization
1219 */
1220EAPI void elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type);
1221
1222/**
1223 * Retrieve the autocapitalization type on the immodule.
1224 *
1225 * @param obj The entry object
1226 * @return autocapitalization type
1227 */
1228EAPI Elm_Autocapital_Type elm_entry_autocapital_type_get(Evas_Object *obj);
1229
1230/**
1231 * Sets the attribute to show the input panel automatically.
1232 *
1233 * @param obj The entry object
1234 * @param enabled If true, the input panel is appeared when entry is clicked or has a focus
1235 */
1236EAPI void elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled);
1237
1238/**
1239 * Retrieve the attribute to show the input panel automatically.
1240 *
1241 * @param obj The entry object
1242 * @return EINA_TRUE if input panel will be appeared when the entry is clicked or has a focus, EINA_FALSE otherwise
1243 */
1244EAPI Eina_Bool elm_entry_input_panel_enabled_get(Evas_Object *obj);
1245 1251
1246/** 1252/**
1247 * @} 1253 * @}