From 4d56dc67169db1fbfed7505a0afdd5acc61a2faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Thu, 21 Jul 2011 20:36:49 +0000 Subject: [PATCH] Incomplete (I need to add a few lil' images) docs for elm_entry. Judge and let me know how they could be improved. Example comes later, blame discomfitor for the half commit SVN revision: 61567 --- legacy/elementary/doc/Makefile.am | 12 +- legacy/elementary/doc/index.doxy | 3 + legacy/elementary/doc/widget_preview_entry1.c | 11 + legacy/elementary/doc/widget_preview_entry2.c | 11 + legacy/elementary/doc/widget_preview_entry3.c | 14 + legacy/elementary/doc/widget_preview_entry4.c | 16 + legacy/elementary/src/lib/Elementary.h.in | 928 +++++++++++++++++- legacy/elementary/src/lib/elm_entry.c | 772 --------------- 8 files changed, 962 insertions(+), 805 deletions(-) create mode 100644 legacy/elementary/doc/widget_preview_entry1.c create mode 100644 legacy/elementary/doc/widget_preview_entry2.c create mode 100644 legacy/elementary/doc/widget_preview_entry3.c create mode 100644 legacy/elementary/doc/widget_preview_entry4.c diff --git a/legacy/elementary/doc/Makefile.am b/legacy/elementary/doc/Makefile.am index e15d509df4..ca851bc852 100644 --- a/legacy/elementary/doc/Makefile.am +++ b/legacy/elementary/doc/Makefile.am @@ -53,7 +53,11 @@ widget_preview_image \ widget_preview_calendar \ widget_preview_bg \ widget_preview_fileselector \ -widget_preview_actionslider +widget_preview_actionslider \ +widget_preview_entry1 \ +widget_preview_entry2 \ +widget_preview_entry3 \ +widget_preview_entry4 LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@ @@ -83,7 +87,11 @@ WGT_PREVIEW = \ calendar:preview-00.png:widget_preview_calendar:300:300 \ bg:preview-00.png:widget_preview_bg:50:50 \ fileselector:preview-00.png:widget_preview_fileselector:300:300 \ - actionslider:preview-00.png:widget_preview_actionslider:120:30 + actionslider:preview-00.png:widget_preview_actionslider:120:30 \ + entry:preview-00.png:widget_preview_entry1:160:50 \ + entry:preview-01.png:widget_preview_entry2:160:50 \ + entry:preview-02.png:widget_preview_entry3:160:50 \ + entry:preview-03.png:widget_preview_entry4:160:50 widget-preview: @for ss in $(WGT_PREVIEW); do \ diff --git a/legacy/elementary/doc/index.doxy b/legacy/elementary/doc/index.doxy index b88f071cc8..c2fba540a6 100644 --- a/legacy/elementary/doc/index.doxy +++ b/legacy/elementary/doc/index.doxy @@ -69,6 +69,9 @@ * @image html img/widget/ctxpopup/preview-00.png * @image latex img/widget/ctxpopup/preview-00.eps * @li @ref Diskselector + * + * @image html img/widget/entry/preview-02.png + * @image latex img/widget/entry/preview-02.eps * @li @ref Entry * @li @ref File_Selector_Button * diff --git a/legacy/elementary/doc/widget_preview_entry1.c b/legacy/elementary/doc/widget_preview_entry1.c new file mode 100644 index 0000000000..1d5ae03787 --- /dev/null +++ b/legacy/elementary/doc/widget_preview_entry1.c @@ -0,0 +1,11 @@ +#include "widget_preview_tmpl_head.c" + +Evas_Object *o = elm_entry_add(win); +elm_entry_single_line_set(o, EINA_TRUE); +evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); +elm_win_resize_object_add(win, o); +evas_object_show(o); + +elm_object_text_set(o, "A single line entry with some format"); + +#include "widget_preview_tmpl_foot.c" diff --git a/legacy/elementary/doc/widget_preview_entry2.c b/legacy/elementary/doc/widget_preview_entry2.c new file mode 100644 index 0000000000..d77c7e1347 --- /dev/null +++ b/legacy/elementary/doc/widget_preview_entry2.c @@ -0,0 +1,11 @@ +#include "widget_preview_tmpl_head.c" + +Evas_Object *o = elm_entry_add(win); +evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); +elm_win_resize_object_add(win, o); +evas_object_show(o); + +elm_object_text_set(o, "Formatted text brokenin more than" + "one line"); + +#include "widget_preview_tmpl_foot.c" diff --git a/legacy/elementary/doc/widget_preview_entry3.c b/legacy/elementary/doc/widget_preview_entry3.c new file mode 100644 index 0000000000..2319b16145 --- /dev/null +++ b/legacy/elementary/doc/widget_preview_entry3.c @@ -0,0 +1,14 @@ +#include "widget_preview_tmpl_head.c" + +Evas_Object *o = elm_entry_add(win); +elm_entry_single_line_set(o, EINA_TRUE); +elm_entry_scrollable_set(o, EINA_TRUE); +evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); +elm_win_resize_object_add(win, o); +evas_object_show(o); + +elm_object_text_set(o, "A single line entry with some format that" + "is so long it won't fit in the small screenshot we are" + "generating for the documentation."); + +#include "widget_preview_tmpl_foot.c" diff --git a/legacy/elementary/doc/widget_preview_entry4.c b/legacy/elementary/doc/widget_preview_entry4.c new file mode 100644 index 0000000000..4bf67ace34 --- /dev/null +++ b/legacy/elementary/doc/widget_preview_entry4.c @@ -0,0 +1,16 @@ +#include "widget_preview_tmpl_head.c" + +Evas_Object *o = elm_entry_add(win); +elm_entry_scrollable_set(o, EINA_TRUE); +evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); +elm_win_resize_object_add(win, o); +evas_object_show(o); + +elm_object_text_set(o, "Some text with Anchors and" + "also items taken from the default theme" + "" + "showing theme with different sizesand how they affect" + "line heights . This will also scroll."); + +#include "widget_preview_tmpl_foot.c" diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 585e6b2de0..e4574cfea8 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/src/lib/Elementary.h.in @@ -1904,6 +1904,12 @@ extern "C" { * @{ */ + typedef enum _Elm_Icon_Type + { + ELM_ICON_NONE, + ELM_ICON_FILE, + ELM_ICON_STANDARD + } Elm_Icon_Type; /** * @enum _Elm_Icon_Lookup_Order * @typedef Elm_Icon_Lookup_Order @@ -5526,122 +5532,981 @@ extern "C" { */ /* entry */ + /** + * @defgroup Entry Entry + * + * @image html img/widget/entry/preview-00.png + * @image latex img/widget/entry/preview-00.eps width=\textwidth + * @image html img/widget/entry/preview-01.png + * @image latex img/widget/entry/preview-01.eps width=\textwidth + * @image html img/widget/entry/preview-02.png + * @image latex img/widget/entry/preview-02.eps width=\textwidth + * @image html img/widget/entry/preview-03.png + * @image latex img/widget/entry/preview-03.eps width=\textwidth + * + * An entry is a convenience widget which shows a box that the user can + * enter text into. Entries by default don't scroll, so they grow to + * accomodate the entire text, resizing the parent window as needed. This + * can be changed with the elm_entry_scrollable_set() function. + * + * They can also be single line or multi line (the default) and when set + * to multi line mode they support text wrapping in any of the modes + * indicated by #Elm_Wrap_Type. + * + * Other features include password mode, filtering of inserted text with + * elm_entry_text_filter_append() and related functions, inline "items" and + * formatted markup text. + * + * @section entry-markup Formatted text + * + * The markup tags supported by the Entry are defined by the theme, but + * even when writing new themes or extensions it's a good idea to stick to + * a sane default, to maintain coherency and avoid application breakages. + * Currently defined by the default theme are the following tags: + * @li \: Inserts a line break. + * @li \: Inserts a paragraph separator. This is preferred over line + * breaks. + * @li \: Inserts a tab. + * @li \...\: Emphasis. Sets the @em oblique style for the + * enclosed text. + * @li \...\: Sets the @b bold style for the enclosed text. + * @li \...\: Underlines the enclosed text. + * @li \...\: Hilights the enclosed text. + * + * @section entry-special Special markups + * + * Besides those used to format text, entries support two special markup + * tags used to insert clickable portions of text or items inlined within + * the text. + * + * @subsection entry-anchors Anchors + * + * Anchors are similar to HTML anchors. Text can be surrounded by \ and + * \ tags and an event will be generated when this text is clicked, + * like this: + * + * @code + * This text is outside but this one is an anchor + * @endcode + * + * The @c href attribute in the opening tag gives the name that will be + * used to identify the anchor and it can be any valid utf8 string. + * + * When an anchor is clicked, an @c "anchor,clicked" signal is emitted with + * an #Elm_Entry_Anchor_Info in the @c event_info parameter for the + * callback function. + * + * @subsection entry-items Items + * + * Inlined in the text, any other @c Evas_Object can be inserted by using + * \ tags this way: + * + * @code + * + * @endcode + * + * Just like with anchors, the @c href identifies each item, but these need, + * in addition, to indicate their size, which is done using any one of + * @c size, @c absize or @c relsize attributes. These attributes take their + * value in the WxH format, where W is the width and H the height of the + * item. + * + * @li absize: Absolute pixel size for the item. Whatever value is set will + * be the item's size regardless of any scale value the object may have + * been set to. The final line height will be adjusted to fit larger items. + * @li size: Similar to @c absize, but it's adjusted to the scale value set + * for the object. + * @li relsize: Size is adjusted for the item to fit within the current + * line height. + * + * Besides their size, items are specificed a @c vsize value that affects + * how their final size and position are calculated. The possible values + * are: + * @li ascent: Item will be placed within the line's baseline and its + * ascent. That is, the height between the line where all characters are + * positioned and the highest point in the line. For @c size and @c absize + * items, the descent value will be added to the total line height to make + * them fit. @c relsize items will be adjusted to fit within this space. + * @li full: Items will be placed between the descent and ascent, or the + * lowest point in the line and its highest. + * + * After the size for an item is calculated, the entry will request an + * object to place in its space. For this, the functions set with + * elm_entry_item_provider_append() and related functions will be called + * in order until one of them returns a @c non-NULL value. If no providers + * are available, or all of them return @c NULL, then the entry falls back + * to one of the internal defaults, provided the name matches with one of + * them. + * + * All of the following are currently supported: + * + * - emoticon/angry + * - emoticon/angry-shout + * - emoticon/crazy-laugh + * - emoticon/evil-laugh + * - emoticon/evil + * - emoticon/goggle-smile + * - emoticon/grumpy + * - emoticon/grumpy-smile + * - emoticon/guilty + * - emoticon/guilty-smile + * - emoticon/haha + * - emoticon/half-smile + * - emoticon/happy-panting + * - emoticon/happy + * - emoticon/indifferent + * - emoticon/kiss + * - emoticon/knowing-grin + * - emoticon/laugh + * - emoticon/little-bit-sorry + * - emoticon/love-lots + * - emoticon/love + * - emoticon/minimal-smile + * - emoticon/not-happy + * - emoticon/not-impressed + * - emoticon/omg + * - emoticon/opensmile + * - emoticon/smile + * - emoticon/sorry + * - emoticon/squint-laugh + * - emoticon/surprised + * - emoticon/suspicious + * - emoticon/tongue-dangling + * - emoticon/tongue-poke + * - emoticon/uh + * - emoticon/unhappy + * - emoticon/very-sorry + * - emoticon/what + * - emoticon/wink + * - emoticon/worried + * - emoticon/wtf + * + * Alternatively, an item may reference an image by its path, using + * the URI form @c file:///path/to/an/image.png and the entry will then + * use that image for the item. + * + * @section entry-files Loading and saving files + * + * Entries have convinience functions to load text from a file and save + * changes back to it after a short delay. The automatic saving is enabled + * by default, but can be disabled with elm_entry_autosave_set() and files + * can be loaded directly as plain text or have any markup in them + * recognized. See elm_entry_file_set() for more details. + * + * @section entry-signals Emitted signals + * + * This widget emits the following signals: + * + * @li "changed": The text within the entry was changed. + * @li "activated": The enter key was pressed on a single line entry. + * @li "press": A mouse button has been pressed on the entry. + * @li "longpressed": A mouse button has been pressed and held for a couple + * seconds. + * @li "clicked": The entry has been clicked (mouse press and release). + * @li "clicked,double": The entry has been double clicked. + * @li "focused": The entry has received focus. + * @li "unfocused": The entry has lost focus. + * @li "selection,paste": A paste of the clipboard contents was requested. + * @li "selection,copy": A copy of the selected text into the clipboard was + * requested. + * @li "selection,cut": A cut of the selected text into the clipboard was + * requested. + * @li "selection,start": A selection has begun and no previous selection + * existed. + * @li "selection,changed": The current selection has changed. + * @li "selection,cleared": The current selection has been cleared. + * @li "cursor,changed": The cursor has changed position. + * @li "anchor,clicked": An anchor has been clicked. The event_info + * parameter for the callback will be an #Elm_Entry_Anchor_Info. + * @li "preedit,changed": The preedit string has changed. + * + * @{ + */ + /** + * @typedef Elm_Entry_Anchor_Info + * + * The info sent in the callback for the "anchor,clicked" signals emitted + * by entries. + */ typedef struct _Elm_Entry_Anchor_Info Elm_Entry_Anchor_Info; + /** + * @struct _Elm_Entry_Anchor_Info + * + * The info sent in the callback for the "anchor,clicked" signals emitted + * by entries. + */ struct _Elm_Entry_Anchor_Info { - const char *name; - int button; - Evas_Coord x, y, w, h; + const char *name; /**< The name of the anchor, as stated in its href */ + int button; /**< The mouse button used to click on it */ + Evas_Coord x, /**< Anchor geometry, relative to canvas */ + y, /**< Anchor geometry, relative to canvas */ + w, /**< Anchor geometry, relative to canvas */ + h; /**< Anchor geometry, relative to canvas */ }; - typedef enum _Elm_Icon_Type - { - ELM_ICON_NONE, - ELM_ICON_FILE, - ELM_ICON_STANDARD - } Elm_Icon_Type; - typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item; /**< Item of Elm_Hoversel. Sub-type of Elm_Widget_Item */ + /** + * This adds an entry to @p parent object. + * + * By default, entries are: + * @li not scrolled + * @li multi-line + * @li word wrapped + * @li autosave is enabled + * + * @param parent The parent object + * @return The new object or NULL if it cannot be created + */ EAPI Evas_Object *elm_entry_add(Evas_Object *parent) EINA_ARG_NONNULL(1); + /** + * Sets the entry to single line mode. + * + * In single line mode, entries don't ever wrap when the text reaches the + * edge, and instead they keep growing horizontally. Pressing the @c Enter + * key will generate an @c "activate" event instead of adding a new line. + * + * When @p single_line is @c EINA_FALSE, line wrapping takes effect again + * and pressing enter will break the text into a different line + * without generating any events. + * + * @param obj The entry object + * @param single_line If true, the text in the entry + * will be on a single line. + */ EAPI void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line) EINA_ARG_NONNULL(1); + /** + * Gets whether the entry is set to be single line. + * + * @param obj The entry object + * @return single_line If true, the text in the entry is set to display + * on a single line. + * + * @see elm_entry_single_line_set() + */ EAPI Eina_Bool elm_entry_single_line_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * Sets the entry to password mode. + * + * In password mode, entries are implicitly single line and the display of + * any text in them is replaced with asterisks (*). + * + * @param obj The entry object + * @param password If true, password mode is enabled. + */ EAPI void elm_entry_password_set(Evas_Object *obj, Eina_Bool password) EINA_ARG_NONNULL(1); + /** + * Gets whether the entry is set to password mode. + * + * @param obj The entry object + * @return If true, the entry is set to display all characters + * as asterisks (*). + * + * @see elm_entry_password_set() + */ EAPI Eina_Bool elm_entry_password_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This sets the text displayed within the entry to @p entry. + * + * @param obj The entry object + * @param entry The text to be displayed + * + * @deprecated Use elm_object_text_set() instead. + */ EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry) EINA_ARG_NONNULL(1); + /** + * This returns the text currently shown in object @p entry. + * See also elm_entry_entry_set(). + * + * @param obj The entry object + * @return The currently displayed text or NULL on failure + * + * @deprecated Use elm_object_text_get() instead. + */ EAPI const char *elm_entry_entry_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * Appends @p entry to the text of the entry. + * + * Adds the text in @p entry to the end of any text already present in the + * widget. + * + * The appended text is subject to any filters set for the widget. + * + * @param obj The entry object + * @param entry The text to be displayed + * + * @see elm_entry_text_filter_append() + */ EAPI void elm_entry_entry_append(Evas_Object *obj, const char *entry) EINA_ARG_NONNULL(1); + /** + * Gets whether the entry is empty. + * + * Empty means no text at all. If there are any markup tags, like an item + * tag for which no provider finds anything, and no text is displayed, this + * function still returns EINA_FALSE. + * + * @param obj The entry object + * @return EINA_TRUE if the entry is empty, EINA_FALSE otherwise. + */ EAPI Eina_Bool elm_entry_is_empty(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * Gets any selected text within the entry. + * + * If there's any selected text in the entry, this function returns it as + * a string in markup format. NULL is returned if no selection exists or + * if an error occurred. + * + * The returned value points to an internal string and should not be freed + * or modified in any way. If the @p entry object is deleted or its + * contents are changed, the returned pointer should be considered invalid. + * + * @param obj The entry object + * @return The selected text within the entry or NULL on failure + */ EAPI const char *elm_entry_selection_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * Inserts the given text into the entry at the current cursor position. + * + * This inserts text at the cursor position as if it was typed + * by the user (note that this also allows markup which a user + * can't just "type" as it would be converted to escaped text, so this + * call can be used to insert things like emoticon items or bold push/pop + * tags, other font and color change tags etc.) + * + * If any selection exists, it will be replaced by the inserted text. + * + * The inserted text is subject to any filters set for the widget. + * + * @param obj The entry object + * @param entry The text to insert + * + * @see elm_entry_text_filter_append() + */ EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry) EINA_ARG_NONNULL(1); + /** + * Set the line wrap type to use on multi-line entries. + * + * Sets the wrap type used by the entry to any of the specified in + * #Elm_Wrap_Type. This tells how the text will be implicitly cut into a new + * line (without inserting a line break or paragraph separator) when it + * reaches the far edge of the widget. + * + * Note that this only makes sense for multi-line entries. A widget set + * to be single line will never wrap. + * + * @param obj The entry object + * @param wrap The wrap mode to use. See #Elm_Wrap_Type for details on them + */ EAPI void elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap) EINA_ARG_NONNULL(1); + /** + * Gets the wrap mode the entry was set to use. + * + * @param obj The entry object + * @return Wrap type + * + * @see also elm_entry_line_wrap_set() + */ EAPI Elm_Wrap_Type elm_entry_line_wrap_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * Sets if the entry is to be editable or not. + * + * By default, entries are editable and when focused, any text input by the + * user will be inserted at the current cursor position. But calling this + * function with @p editable as EINA_FALSE will prevent the user from + * inputting text into the entry. + * + * The only way to change the text of a non-editable entry is to use + * elm_object_text_set(), elm_entry_entry_insert() and other related + * functions. + * + * @param obj The entry object + * @param editable If EINA_TRUE, user input will be inserted in the entry, + * if not, the entry is read-only and no user input is allowed. + */ EAPI void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable) EINA_ARG_NONNULL(1); + /** + * Gets whether the entry is editable or not. + * + * @param obj The entry object + * @return If true, the entry is editable by the user. + * If false, it is not editable by the user + * + * @see elm_entry_editable_set() + */ EAPI Eina_Bool elm_entry_editable_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This drops any existing text selection within the entry. + * + * @param obj The entry object + */ EAPI void elm_entry_select_none(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This selects all text within the entry. + * + * @param obj The entry object + */ EAPI void elm_entry_select_all(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor one place to the right within the entry. + * + * @param obj The entry object + * @return EINA_TRUE upon success, EINA_FALSE upon failure + */ EAPI Eina_Bool elm_entry_cursor_next(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor one place to the left within the entry. + * + * @param obj The entry object + * @return EINA_TRUE upon success, EINA_FALSE upon failure + */ EAPI Eina_Bool elm_entry_cursor_prev(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor one line up within the entry. + * + * @param obj The entry object + * @return EINA_TRUE upon success, EINA_FALSE upon failure + */ EAPI Eina_Bool elm_entry_cursor_up(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor one line down within the entry. + * + * @param obj The entry object + * @return EINA_TRUE upon success, EINA_FALSE upon failure + */ EAPI Eina_Bool elm_entry_cursor_down(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor to the beginning of the entry. + * + * @param obj The entry object + */ EAPI void elm_entry_cursor_begin_set(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor to the end of the entry. + * + * @param obj The entry object + */ EAPI void elm_entry_cursor_end_set(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor to the beginning of the current line. + * + * @param obj The entry object + */ EAPI void elm_entry_cursor_line_begin_set(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This moves the cursor to the end of the current line. + * + * @param obj The entry object + */ EAPI void elm_entry_cursor_line_end_set(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This begins a selection within the entry as though + * the user were holding down the mouse button to make a selection. + * + * @param obj The entry object + */ EAPI void elm_entry_cursor_selection_begin(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This ends a selection within the entry as though + * the user had just released the mouse button while making a selection. + * + * @param obj The entry object + */ EAPI void elm_entry_cursor_selection_end(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * TODO: fill this in + * + * @param obj The entry object + * @return TODO: fill this in + */ EAPI Eina_Bool elm_entry_cursor_is_format_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This returns whether the cursor is visible. + * + * @param obj The entry object + * @return If true, the cursor is visible. + */ EAPI Eina_Bool elm_entry_cursor_is_visible_format_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * TODO: fill this in + * + * @param obj The entry object + * @return TODO: fill this in + */ EAPI const char *elm_entry_cursor_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This function returns the geometry of the cursor. + * + * It's useful if you want to draw something on the cursor (or where it is), + * or for example in the case of scrolled entry where you want to show the + * cursor. + * + * @param obj The entry object + * @param x returned geometry + * @param y returned geometry + * @param w returned geometry + * @param h returned geometry + * @return EINA_TRUE upon success, EINA_FALSE upon failure + */ EAPI Eina_Bool elm_entry_cursor_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) EINA_ARG_NONNULL(1); + /** + * Sets the cursor position in the entry to the given value + * + * @param obj The entry object + * @param pos The position of the cursor + */ EAPI void elm_entry_cursor_pos_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); + /** + * Retrieves the current position of the cursor in the entry + * + * @param obj The entry object + * @return The cursor position + */ EAPI int elm_entry_cursor_pos_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This executes a "cut" action on the selected text in the entry. + * + * @param obj The entry object + */ EAPI void elm_entry_selection_cut(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This executes a "copy" action on the selected text in the entry. + * + * @param obj The entry object + */ EAPI void elm_entry_selection_copy(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This executes a "paste" action in the entry. + * + * @param obj The entry object + */ EAPI void elm_entry_selection_paste(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This clears and frees the items in a entry's contextual (longpress) + * menu. + * + * @param obj The entry object + * + * @see elm_entry_context_menu_item_add() + */ EAPI void elm_entry_context_menu_clear(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This adds an item to the entry's contextual menu. + * + * A longpress on an entry will make the contextual menu show up, if this + * hasn't been disabled with elm_entry_context_menu_disabled_set(). + * By default, this menu provides a few options like enabling selection mode, + * which is useful on embedded devices that need to be explicit about it, + * and when a selection exists it also shows the copy and cut actions. + * + * With this function, developers can add other options to this menu to + * perform any action they deem necessary. + * + * @param obj The entry object + * @param label The item's text label + * @param icon_file The item's icon file + * @param icon_type The item's icon type + * @param func The callback to execute when the item is clicked + * @param data The data to associate with the item for related functions + */ EAPI void elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data) EINA_ARG_NONNULL(1); + /** + * This disables the entry's contextual (longpress) menu. + * + * @param obj The entry object + * @param disabled If true, the menu is disabled + */ EAPI void elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled) EINA_ARG_NONNULL(1); + /** + * This returns whether the entry's contextual (longpress) menu is + * disabled. + * + * @param obj The entry object + * @return If true, the menu is disabled + */ EAPI Eina_Bool elm_entry_context_menu_disabled_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This appends a custom item provider to the list for that entry + * + * This appends the given callback. The list is walked from beginning to end + * with each function called given the item href string in the text. If the + * function returns an object handle other than NULL (it should create an + * object to do this), then this object is used to replace that item. If + * not the next provider is called until one provides an item object, or the + * default provider in entry does. + * + * @param obj The entry object + * @param func The function called to provide the item object + * @param data The data passed to @p func + * + * @see @ref entry-items + */ EAPI void elm_entry_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data) EINA_ARG_NONNULL(1, 2); + /** + * This prepends a custom item provider to the list for that entry + * + * This prepends the given callback. See elm_entry_item_provider_append() for + * more information + * + * @param obj The entry object + * @param func The function called to provide the item object + * @param data The data passed to @p func + */ EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data) EINA_ARG_NONNULL(1, 2); + /** + * This removes a custom item provider to the list for that entry + * + * This removes the given callback. See elm_entry_item_provider_append() for + * more information + * + * @param obj The entry object + * @param func The function called to provide the item object + * @param data The data passed to @p func + */ EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data) EINA_ARG_NONNULL(1, 2); + /** + * Append a filter function for text inserted in the entry + * + * Append the given callback to the list. This functions will be called + * whenever any text is inserted into the entry, with the text to be inserted + * as a parameter. The callback function is free to alter the text in any way + * it wants, but it must remember to free the given pointer and update it. + * If the new text is to be discarded, the function can free it and set its + * text parameter to NULL. This will also prevent any following filters from + * being called. + * + * @param obj The entry object + * @param func The function to use as text filter + * @param data User data to pass to @p func + */ EAPI void elm_entry_text_filter_append(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data) EINA_ARG_NONNULL(1, 2); + /** + * Prepend a filter function for text insdrted in the entry + * + * Prepend the given callback to the list. See elm_entry_text_filter_append() + * for more information + * + * @param obj The entry object + * @param func The function to use as text filter + * @param data User data to pass to @p func + */ EAPI void elm_entry_text_filter_prepend(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data) EINA_ARG_NONNULL(1, 2); + /** + * Remove a filter from the list + * + * Removes the given callback from the filter list. See + * elm_entry_text_filter_append() for more information. + * + * @param obj The entry object + * @param func The filter function to remove + * @param data The user data passed when adding the function + */ EAPI void elm_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data) EINA_ARG_NONNULL(1, 2); + /** + * This converts a markup (HTML-like) string into UTF-8. + * + * The returned string is a malloc'ed buffer and it should be freed when + * not needed anymore. + * + * @param s The string (in markup) to be converted + * @return The converted string (in UTF-8). It should be freed. + */ EAPI char *elm_entry_markup_to_utf8(const char *s) EINA_MALLOC EINA_WARN_UNUSED_RESULT; + /** + * This converts a UTF-8 string into markup (HTML-like). + * + * The returned string is a malloc'ed buffer and it should be freed when + * not needed anymore. + * + * @param s The string (in UTF-8) to be converted + * @return The converted string (in markup). It should be freed. + */ EAPI char *elm_entry_utf8_to_markup(const char *s) EINA_MALLOC EINA_WARN_UNUSED_RESULT; + /** + * This sets the file (and implicitly loads it) for the text to display and + * then edit. All changes are written back to the file after a short delay if + * the entry object is set to autosave (which is the default). + * + * If the entry had any other file set previously, any changes made to it + * will be saved if the autosave feature is enabled, otherwise, the file + * will be silently discarded and any non-saved changes will be lost. + * + * @param obj The entry object + * @param file The path to the file to load and save + * @param format The file format + */ EAPI void elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format) EINA_ARG_NONNULL(1); + /** + * Gets the file being edited by the entry. + * + * This function can be used to retrieve any file set on the entry for + * edition, along with the format used to load and save it. + * + * @param obj The entry object + * @param file The path to the file to load and save + * @param format The file format + */ EAPI void elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format) EINA_ARG_NONNULL(1); + /** + * This function writes any changes made to the file set with + * elm_entry_file_set() + * + * @param obj The entry object + */ EAPI void elm_entry_file_save(Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * This sets the entry object to 'autosave' the loaded text file or not. + * + * @param obj The entry object + * @param autosave Autosave the loaded file or not + * + * @see elm_entry_file_set() + */ EAPI void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave) EINA_ARG_NONNULL(1); + /** + * This gets the entry object's 'autosave' status. + * + * @param obj The entry object + * @return Autosave the loaded file or not + * + * @see elm_entry_file_set() + */ EAPI Eina_Bool elm_entry_autosave_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * Control pasting of text and images for the widget. + * + * Normally the entry allows both text and images to be pasted. By setting + * textonly to be true, this prevents images from being pasted. + * + * Note this only changes the behaviour of text. + * + * @param obj The entry object + * @param textonly paste mode - EINA_TRUE is text only, EINA_FALSE is + * text+image+other. + */ EAPI void elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly) EINA_ARG_NONNULL(1); + /** + * Getting elm_entry text paste/drop mode. + * + * In textonly mode, only text may be pasted or dropped into the widget. + * + * @param obj The entry object + * @return If the widget only accepts text from pastes. + */ EAPI Eina_Bool elm_entry_cnp_textonly_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /** + * Enable or disable scrolling in entry + * + * Normally the entry is not scrollable unless you enable it with this call. + * + * @param obj The entry object + * @param scroll EINA_TRUE if it is to be scrollable, EINA_FALSE otherwise + */ EAPI void elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scroll); + /** + * Get the scrollable state of the entry + * + * Normally the entry is not scrollable. This gets the scrollable state + * of the entry. See elm_entry_scrollable_set() for more information. + * + * @param obj The entry object + * @return The scrollable state + */ EAPI Eina_Bool elm_entry_scrollable_get(const Evas_Object *obj); + /** + * This sets a widget to be displayed to the left of a scrolled entry. + * + * @param obj The scrolled entry object + * @param icon The widget to display on the left side of the scrolled + * entry. + * + * @note A previously set widget will be destroyed. + * @note If the object being set does not have minimum size hints set, + * it won't get properly displayed. + * + * @see elm_entry_end_set() + */ EAPI void elm_entry_icon_set(Evas_Object *obj, Evas_Object *icon); + /** + * Gets the leftmost widget of the scrolled entry. This object is + * owned by the scrolled entry and should not be modified. + * + * @param obj The scrolled entry object + * @return the left widget inside the scroller + */ EAPI Evas_Object *elm_entry_icon_get(const Evas_Object *obj); + /** + * Unset the leftmost widget of the scrolled entry, unparenting and + * returning it. + * + * @param obj The scrolled entry object + * @return the previously set icon sub-object of this entry, on + * success. + * + * @see elm_entry_icon_set() + */ EAPI Evas_Object *elm_entry_icon_unset(Evas_Object *obj); + /** + * Sets the visibility of the left-side widget of the scrolled entry, + * set by @elm_entry_icon_set(). + * + * @param obj The scrolled entry object + * @param setting EINA_TRUE if the object should be displayed, + * EINA_FALSE if not. + */ EAPI void elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting); + /** + * This sets a widget to be displayed to the end of a scrolled entry. + * + * @param obj The scrolled entry object + * @param end The widget to display on the right side of the scrolled + * entry. + * + * @note A previously set widget will be destroyed. + * @note If the object being set does not have minimum size hints set, + * it won't get properly displayed. + * + * @see elm_entry_icon_set + */ EAPI void elm_entry_end_set(Evas_Object *obj, Evas_Object *end); + /** + * Gets the endmost widget of the scrolled entry. This object is owned + * by the scrolled entry and should not be modified. + * + * @param obj The scrolled entry object + * @return the right widget inside the scroller + */ EAPI Evas_Object *elm_entry_end_get(const Evas_Object *obj); + /** + * Unset the endmost widget of the scrolled entry, unparenting and + * returning it. + * + * @param obj The scrolled entry object + * @return the previously set icon sub-object of this entry, on + * success. + * + * @see elm_entry_icon_set() + */ EAPI Evas_Object *elm_entry_end_unset(Evas_Object *obj); + /** + * Sets the visibility of the end widget of the scrolled entry, set by + * @elm_entry_end_set(). + * + * @param obj The scrolled entry object + * @param setting EINA_TRUE if the object should be displayed, + * EINA_FALSE if not. + */ EAPI void elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting); + /** + * This sets the scrolled entry's scrollbar policy (ie. enabling/disabling + * them). + * + * Setting an entry to single-line mode with elm_entry_single_line_set() + * will automatically disable the display of scrollbars when the entry + * moves inside its scroller. + * + * @param obj The scrolled entry object + * @param h The horizontal scrollbar policy to apply + * @param v The vertical scrollbar policy to apply + */ EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v); + /** + * This enables/disables bouncing within the entry. + * + * This function sets whether the entry will bounce when scrolling reaches + * the end of the contained entry. + * + * @param obj The scrolled entry object + * @param h The horizontal bounce state + * @param v The vertical bounce state + */ EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); + /** + * Get the bounce mode + * + * @param obj The Entry object + * @param h_bounce Allow bounce horizontally + * @param v_bounce Allow bounce vertically + */ EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); /* pre-made filters for entries */ + /** + * @typedef Elm_Entry_Filter_Limit_Size + * + * Data for the elm_entry_filter_limit_size() entry filter. + */ typedef struct _Elm_Entry_Filter_Limit_Size Elm_Entry_Filter_Limit_Size; + /** + * @struct _Elm_Entry_Filter_Limit_Size + * + * Data for the elm_entry_filter_limit_size() entry filter. + */ struct _Elm_Entry_Filter_Limit_Size { - int max_char_count; - int max_byte_count; + int max_char_count; /**< The maximum number of characters allowed. */ + int max_byte_count; /**< The maximum number of bytes allowed*/ }; + /** + * Filter inserted text based on user defined character and byte limits + * + * Add this filter to an entry to limit the characters that it will accept + * based the the contents of the provided #Elm_Entry_Filter_Limit_Size. + * The funtion works on the UTF-8 representation of the string, converting + * it from the set markup, thus not accounting for any format in it. + * + * The user must create an #Elm_Entry_Filter_Limit_Size structure and pass + * it as data when setting the filter. In it, it's possible to set limits + * by character count or bytes (any of them is disabled if 0), and both can + * be set at the same time. In that case, it first checks for characters, + * then bytes. + * + * The function will cut the inserted text in order to allow only the first + * number of characters that are still allowed. The cut is made in + * characters, even when limiting by bytes, in order to always contain + * valid ones and avoid half unicode characters making it in. + * + * This filter, like any others, does not apply when setting the entry text + * directly with elm_object_text_set() (or the deprecated + * elm_entry_entry_set()). + */ EAPI void elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text) EINA_ARG_NONNULL(1, 2, 3); + /** + * @typedef Elm_Entry_Filter_Accept_Set + * + * Data for the elm_entry_filter_accept_set() entry filter. + */ typedef struct _Elm_Entry_Filter_Accept_Set Elm_Entry_Filter_Accept_Set; + /** + * @struct _Elm_Entry_Filter_Accept_Set + * + * Data for the elm_entry_filter_accept_set() entry filter. + */ struct _Elm_Entry_Filter_Accept_Set { - const char *accepted; - const char *rejected; + const char *accepted; /**< Set of characters accepted in the entry. */ + const char *rejected; /**< Set of characters rejected from the entry. */ }; + /** + * Filter inserted text based on accepted or rejected sets of characters + * + * Add this filter to an entry to restrict the set of accepted characters + * based on the sets in the provided #Elm_Entry_Filter_Accept_Set. + * This structure contains both accepted and rejected sets, but they are + * mutually exclusive. + * + * The @c accepted set takes preference, so if it is set, the filter will + * only work based on the accepted characters, ignoring anything in the + * @c rejected value. If @c accepted is @c NULL, then @c rejected is used. + * + * In both cases, the function filters by matching utf8 characters to the + * raw markup text, so it can be used to remove formatting tags. + * + * This filter, like any others, does not apply when setting the entry text + * directly with elm_object_text_set() (or the deprecated + * elm_entry_entry_set()). + */ EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text) EINA_ARG_NONNULL(1, 3); - /* smart callbacks called: - * "changed" - the text content changed - * "selection,start" - the user started selecting text - * "selection,changed" - the user modified the selection size/location - * "selection,cleared" - the user cleared the selection - * "selection,paste" - the user requested a paste of text - * "selection,copy" - the user copied the text - * "selection,cut" - the user cut the text - * "cursor,changed" - the cursor changed position - * "anchor,clicked" - achor called was clicked | event_info = Elm_Entry_Anchor_Info - * "activated" - when the enter key is pressed (useful for single line) - * "press" - when finger/mouse is pressed down - * "clicked" - when finger/mouse is pressed and released (without a drag etc.) - * "clicked,double" - when finger/mouse is double-pressed - * "longpressed" - the entry has been longpressed - * "focused" - the entry has received keyboard focus - * "unfocused" - keyboard focus is gone + /** + * @} */ /* composite widgets - these basically put together basic widgets above @@ -6713,6 +7578,7 @@ extern "C" { * See @ref tutorial_hoversel for an example. * @{ */ + typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item; /**< Item of Elm_Hoversel. Sub-type of Elm_Widget_Item */ /** * @brief Add a new Hoversel object * diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index dfde8fe093..5960bfdda1 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -2,97 +2,6 @@ #include #include "elm_priv.h" -/** - * @defgroup Entry Entry - * - * An entry is a convenience widget which shows - * a box that the user can enter text into. Unlike a - * @ref Scrolled_Entry widget, entries DO NOT scroll with user - * input. Entry widgets are capable of expanding past the - * boundaries of the window, thus resizing the window to its - * own length. - * - * You can also insert "items" in the entry with: - * - * \\ - * - * for example. sizing can be set bu size=WxH, relsize=WxH or absize=WxH with - * vsize=ascent or vsize=full. the href=NAME sets the item name. Entry - * supports a list of emoticon names by default. These are: - * - * - emoticon/angry - * - emoticon/angry-shout - * - emoticon/crazy-laugh - * - emoticon/evil-laugh - * - emoticon/evil - * - emoticon/goggle-smile - * - emoticon/grumpy - * - emoticon/grumpy-smile - * - emoticon/guilty - * - emoticon/guilty-smile - * - emoticon/haha - * - emoticon/half-smile - * - emoticon/happy-panting - * - emoticon/happy - * - emoticon/indifferent - * - emoticon/kiss - * - emoticon/knowing-grin - * - emoticon/laugh - * - emoticon/little-bit-sorry - * - emoticon/love-lots - * - emoticon/love - * - emoticon/minimal-smile - * - emoticon/not-happy - * - emoticon/not-impressed - * - emoticon/omg - * - emoticon/opensmile - * - emoticon/smile - * - emoticon/sorry - * - emoticon/squint-laugh - * - emoticon/surprised - * - emoticon/suspicious - * - emoticon/tongue-dangling - * - emoticon/tongue-poke - * - emoticon/uh - * - emoticon/unhappy - * - emoticon/very-sorry - * - emoticon/what - * - emoticon/wink - * - emoticon/worried - * - emoticon/wtf - * - * These are built-in currently, but you can add your own item provieer that - * can create inlined objects in the text and fill the space allocated to the - * item with a custom object of your own. - * - * See the entry test for some more examples of use of this. - * - * Entries have functions to load a text file, display it, - * allowing editing of it and saving of changes back to the file loaded. - * Changes are written back to the original file after a short delay. - * The file to load and save to is specified by elm_entry_file_set(). - * - * Signals that you can add callbacks for are: - * - * "changed" - The text within the entry was changed - * "activated" - The entry has had editing finished and changes are to be committed - * (generally when enter key is pressed) - * "press" - The entry has been clicked - * "longpressed" - The entry has been clicked for a couple seconds - * "clicked" - The entry has been clicked - * "clicked,double" - The entry has been double clicked - * "focused" - The entry has received focus - * "unfocused" - The entry has lost focus - * "selection,paste" - A paste action has occurred - * "selection,copy" - A copy action has occurred - * "selection,cut" - A cut action has occurred - * "selection,start" - A selection has begun - * "selection,changed" - The selection has changed - * "selection,cleared" - The selection has been cleared - * "cursor,changed" - The cursor has changed - * "anchor,clicked" - The anchor has been clicked - * "preedit,changed" - The preedit string has changed - */ /* Maximum chunk size to be inserted to the entry at once * FIXME: This size is arbitrary, should probably choose a better size. @@ -1948,14 +1857,6 @@ _elm_entry_text_get(const Evas_Object *obj, const char *item) return wd->text; } -/** - * This adds an entry to @p parent object. - * - * @param parent The parent object - * @return The new object or NULL if it cannot be created - * - * @ingroup Entry - */ EAPI Evas_Object * elm_entry_add(Evas_Object *parent) { @@ -2090,16 +1991,6 @@ elm_entry_add(Evas_Object *parent) return obj; } -/** - * This sets the entry object not to line wrap. All input will - * be on a single line, and the entry box will extend with user input. - * - * @param obj The entry object - * @param single_line If true, the text in the entry - * will be on a single line. - * - * @ingroup Entry - */ EAPI void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line) { @@ -2133,16 +2024,6 @@ elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line) } } -/** - * This returns true if the entry has been set to single line mode. - * See also elm_entry_single_line_set(). - * - * @param obj The entry object - * @return single_line If true, the text in the entry is set to display - * on a single line. - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_single_line_get(const Evas_Object *obj) { @@ -2152,15 +2033,6 @@ elm_entry_single_line_get(const Evas_Object *obj) return wd->single_line; } -/** - * This sets the entry object to password mode. All text entered - * and/or displayed within the widget will be replaced with asterisks (*). - * - * @param obj The entry object - * @param password If true, password mode is enabled. - * - * @ingroup Entry - */ EAPI void elm_entry_password_set(Evas_Object *obj, Eina_Bool password) { @@ -2174,16 +2046,6 @@ elm_entry_password_set(Evas_Object *obj, Eina_Bool password) _theme_hook(obj); } -/** - * This returns whether password mode is enabled. - * See also elm_entry_password_set(). - * - * @param obj The entry object - * @return If true, the entry is set to display all characters - * as asterisks (*). - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_password_get(const Evas_Object *obj) { @@ -2193,28 +2055,12 @@ elm_entry_password_get(const Evas_Object *obj) return wd->password; } -/** - * This sets the text displayed within the entry to @p entry. - * - * @param obj The entry object - * @param entry The text to be displayed - * - * @ingroup Entry - */ EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry) { _elm_entry_text_set(obj, NULL, entry); } -/** - * This appends @p entry to the text of the entry. - * - * @param obj The entry object - * @param entry The text to be displayed - * - * @ingroup Entry - */ EAPI void elm_entry_entry_append(Evas_Object *obj, const char *entry) { @@ -2246,30 +2092,12 @@ elm_entry_entry_append(Evas_Object *obj, const char *entry) } } -/** - * This returns the text currently shown in object @p entry. - * See also elm_entry_entry_set(). - * - * @param obj The entry object - * @return The currently displayed text or NULL on failure - * - * @ingroup Entry - */ EAPI const char * elm_entry_entry_get(const Evas_Object *obj) { return _elm_entry_text_get(obj, NULL); } -/** - * This returns EINA_TRUE if the entry is empty/there was an error - * and EINA_FALSE if it is not empty. - * - * @param obj The entry object - * @return If the entry is empty or not. - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_is_empty(const Evas_Object *obj) { @@ -2296,14 +2124,6 @@ elm_entry_is_empty(const Evas_Object *obj) return !ret; } -/** - * This returns all selected text within the entry. - * - * @param obj The entry object - * @return The selected text within the entry or NULL on failure - * - * @ingroup Entry - */ EAPI const char * elm_entry_selection_get(const Evas_Object *obj) { @@ -2313,20 +2133,6 @@ elm_entry_selection_get(const Evas_Object *obj) return edje_object_part_text_selection_get(wd->ent, "elm.text"); } -/** - * This inserts text in @p entry where the current cursor position. - * - * This inserts text at the cursor position is as if it was typed - * by the user (note this also allows markup which a user - * can't just "type" as it would be converted to escaped text, so this - * call can be used to insert things like emoticon items or bold push/pop - * tags, other font and color change tags etc.) - * - * @param obj The entry object - * @param entry The text to insert - * - * @ingroup Entry - */ EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry) { @@ -2338,18 +2144,6 @@ elm_entry_entry_insert(Evas_Object *obj, const char *entry) _sizing_eval(obj); } -/** - * This enables word line wrapping in the entry object. It is the opposite - * of elm_entry_single_line_set(). Additionally, setting this disables - * character line wrapping. - * - * @param obj The entry object - * @param wrap If true, the entry will be wrapped once it reaches the end - * of the object. Wrapping will occur at the end of the word before the end of the - * object. - * - * @ingroup Entry - */ EAPI void elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap) { @@ -2362,15 +2156,6 @@ elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap) _theme_hook(obj); } -/** - * Get the wrapping behavior of the entry. - * See also elm_entry_line_wrap_set(). - * - * @param obj The entry object - * @return Wrap type - * - * @ingroup Entry - */ EAPI Elm_Wrap_Type elm_entry_line_wrap_get(const Evas_Object *obj) { @@ -2380,15 +2165,6 @@ elm_entry_line_wrap_get(const Evas_Object *obj) return wd->linewrap; } -/** - * This sets the editable attribute of the entry. - * - * @param obj The entry object - * @param editable If true, the entry will be editable by the user. - * If false, it will be set to the disabled state. - * - * @ingroup Entry - */ EAPI void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable) { @@ -2407,16 +2183,6 @@ elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable) #endif } -/** - * This gets the editable attribute of the entry. - * See also elm_entry_editable_set(). - * - * @param obj The entry object - * @return If true, the entry is editable by the user. - * If false, it is not editable by the user - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_editable_get(const Evas_Object *obj) { @@ -2426,13 +2192,6 @@ elm_entry_editable_get(const Evas_Object *obj) return wd->editable; } -/** - * This drops any existing text selection within the entry. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_select_none(Evas_Object *obj) { @@ -2450,13 +2209,6 @@ elm_entry_select_none(Evas_Object *obj) edje_object_part_text_select_none(wd->ent, "elm.text"); } -/** - * This selects all text within the entry. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_select_all(Evas_Object *obj) { @@ -2474,22 +2226,6 @@ elm_entry_select_all(Evas_Object *obj) edje_object_part_text_select_all(wd->ent, "elm.text"); } -/** - * This function returns the geometry of the cursor. - * - * It's useful if you want to draw something on the cursor (or where it is), - * or for example in the case of scrolled entry where you want to show the - * cursor. - * - * @param obj The entry object - * @param x returned geometry - * @param y returned geometry - * @param w returned geometry - * @param h returned geometry - * @return EINA_TRUE upon success, EINA_FALSE upon failure - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cursor_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { @@ -2500,14 +2236,6 @@ elm_entry_cursor_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord return EINA_TRUE; } -/** - * This moves the cursor one place to the right within the entry. - * - * @param obj The entry object - * @return EINA_TRUE upon success, EINA_FALSE upon failure - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cursor_next(Evas_Object *obj) { @@ -2517,14 +2245,6 @@ elm_entry_cursor_next(Evas_Object *obj) return edje_object_part_text_cursor_next(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This moves the cursor one place to the left within the entry. - * - * @param obj The entry object - * @return EINA_TRUE upon success, EINA_FALSE upon failure - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cursor_prev(Evas_Object *obj) { @@ -2534,14 +2254,6 @@ elm_entry_cursor_prev(Evas_Object *obj) return edje_object_part_text_cursor_prev(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This moves the cursor one line up within the entry. - * - * @param obj The entry object - * @return EINA_TRUE upon success, EINA_FALSE upon failure - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cursor_up(Evas_Object *obj) { @@ -2551,14 +2263,6 @@ elm_entry_cursor_up(Evas_Object *obj) return edje_object_part_text_cursor_up(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This moves the cursor one line down within the entry. - * - * @param obj The entry object - * @return EINA_TRUE upon success, EINA_FALSE upon failure - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cursor_down(Evas_Object *obj) { @@ -2568,13 +2272,6 @@ elm_entry_cursor_down(Evas_Object *obj) return edje_object_part_text_cursor_down(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This moves the cursor to the beginning of the entry. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_cursor_begin_set(Evas_Object *obj) { @@ -2584,13 +2281,6 @@ elm_entry_cursor_begin_set(Evas_Object *obj) edje_object_part_text_cursor_begin_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This moves the cursor to the end of the entry. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_cursor_end_set(Evas_Object *obj) { @@ -2606,13 +2296,6 @@ elm_entry_cursor_end_set(Evas_Object *obj) } } -/** - * This moves the cursor to the beginning of the current line. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_cursor_line_begin_set(Evas_Object *obj) { @@ -2622,13 +2305,6 @@ elm_entry_cursor_line_begin_set(Evas_Object *obj) edje_object_part_text_cursor_line_begin_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This moves the cursor to the end of the current line. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_cursor_line_end_set(Evas_Object *obj) { @@ -2638,14 +2314,6 @@ elm_entry_cursor_line_end_set(Evas_Object *obj) edje_object_part_text_cursor_line_end_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This begins a selection within the entry as though - * the user were holding down the mouse button to make a selection. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_cursor_selection_begin(Evas_Object *obj) { @@ -2655,14 +2323,6 @@ elm_entry_cursor_selection_begin(Evas_Object *obj) edje_object_part_text_select_begin(wd->ent, "elm.text"); } -/** - * This ends a selection within the entry as though - * the user had just released the mouse button while making a selection. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_cursor_selection_end(Evas_Object *obj) { @@ -2672,14 +2332,6 @@ elm_entry_cursor_selection_end(Evas_Object *obj) edje_object_part_text_select_extend(wd->ent, "elm.text"); } -/** - * TODO: fill this in - * - * @param obj The entry object - * @return TODO: fill this in - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cursor_is_format_get(const Evas_Object *obj) { @@ -2689,14 +2341,6 @@ elm_entry_cursor_is_format_get(const Evas_Object *obj) return edje_object_part_text_cursor_is_format_get(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This returns whether the cursor is visible. - * - * @param obj The entry object - * @return If true, the cursor is visible. - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cursor_is_visible_format_get(const Evas_Object *obj) { @@ -2706,14 +2350,6 @@ elm_entry_cursor_is_visible_format_get(const Evas_Object *obj) return edje_object_part_text_cursor_is_visible_format_get(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * TODO: fill this in - * - * @param obj The entry object - * @return TODO: fill this in - * - * @ingroup Entry - */ EAPI const char * elm_entry_cursor_content_get(const Evas_Object *obj) { @@ -2723,14 +2359,6 @@ elm_entry_cursor_content_get(const Evas_Object *obj) return edje_object_part_text_cursor_content_get(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * Sets the cursor position in the entry to the given value - * - * @param obj The entry object - * @param pos The position of the cursor - * - * @ingroup Entry - */ EAPI void elm_entry_cursor_pos_set(Evas_Object *obj, int pos) { @@ -2741,14 +2369,6 @@ elm_entry_cursor_pos_set(Evas_Object *obj, int pos) edje_object_message_signal_process(wd->ent); } -/** - * Retrieves the current position of the cursor in the entry - * - * @param obj The entry object - * @return The cursor position - * - * @ingroup Entry - */ EAPI int elm_entry_cursor_pos_get(const Evas_Object *obj) { @@ -2758,13 +2378,6 @@ elm_entry_cursor_pos_get(const Evas_Object *obj) return edje_object_part_text_cursor_pos_get(wd->ent, "elm.text", EDJE_CURSOR_MAIN); } -/** - * This executes a "cut" action on the selected text in the entry. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_selection_cut(Evas_Object *obj) { @@ -2774,13 +2387,6 @@ elm_entry_selection_cut(Evas_Object *obj) _cut(obj, NULL, NULL); } -/** - * This executes a "copy" action on the selected text in the entry. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_selection_copy(Evas_Object *obj) { @@ -2790,13 +2396,6 @@ elm_entry_selection_copy(Evas_Object *obj) _copy(obj, NULL, NULL); } -/** - * This executes a "paste" action in the entry. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_selection_paste(Evas_Object *obj) { @@ -2806,13 +2405,6 @@ elm_entry_selection_paste(Evas_Object *obj) _paste(obj, NULL, NULL); } -/** - * This clears and frees the items in a entry's contextual (right click) menu. - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_context_menu_clear(Evas_Object *obj) { @@ -2829,18 +2421,6 @@ elm_entry_context_menu_clear(Evas_Object *obj) } } -/** - * This adds an item to the entry's contextual menu. - * - * @param obj The entry object - * @param label The item's text label - * @param icon_file The item's icon file - * @param icon_type The item's icon type - * @param func The callback to execute when the item is clicked - * @param data The data to associate with the item for related functions - * - * @ingroup Entry - */ EAPI void elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data) { @@ -2859,14 +2439,6 @@ elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char it->data = (void *)data; } -/** - * This disables the entry's contextual (right click) menu. - * - * @param obj The entry object - * @param disabled If true, the menu is disabled - * - * @ingroup Entry - */ EAPI void elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled) { @@ -2877,14 +2449,6 @@ elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled) wd->context_menu = !disabled; } -/** - * This returns whether the entry's contextual (right click) menu is disabled. - * - * @param obj The entry object - * @return If true, the menu is disabled - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_context_menu_disabled_get(const Evas_Object *obj) { @@ -2894,22 +2458,6 @@ elm_entry_context_menu_disabled_get(const Evas_Object *obj) return !wd->context_menu; } -/** - * This appends a custom item provider to the list for that entry - * - * This appends the given callback. The list is walked from beginning to end - * with each function called given the item href string in the text. If the - * function returns an object handle other than NULL (it should create an - * and object to do this), then this object is used to replace that item. If - * not the next provider is called until one provides an item object, or the - * default provider in entry does. - * - * @param obj The entry object - * @param func The function called to provide the item object - * @param data The data passed to @p func - * - * @ingroup Entry - */ EAPI void elm_entry_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data) { @@ -2924,18 +2472,6 @@ elm_entry_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *dat wd->item_providers = eina_list_append(wd->item_providers, ip); } -/** - * This prepends a custom item provider to the list for that entry - * - * This prepends the given callback. See elm_entry_item_provider_append() for - * more information - * - * @param obj The entry object - * @param func The function called to provide the item object - * @param data The data passed to @p func - * - * @ingroup Entry - */ EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data) { @@ -2950,18 +2486,6 @@ elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *da wd->item_providers = eina_list_prepend(wd->item_providers, ip); } -/** - * This removes a custom item provider to the list for that entry - * - * This removes the given callback. See elm_entry_item_provider_append() for - * more information - * - * @param obj The entry object - * @param func The function called to provide the item object - * @param data The data passed to @p func - * - * @ingroup Entry - */ EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data) { @@ -2982,23 +2506,6 @@ elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *dat } } -/** - * Append a filter function for text inserted in the entry - * - * Append the given callback to the list. This functions will be called - * whenever any text is inserted into the entry, with the text to be inserted - * as a parameter. The callback function is free to alter the text in any way - * it wants, but it must remember to free the given pointer and update it. - * If the new text is to be discarded, the function can free it and set it text - * parameter to NULL. This will also prevent any following filters from being - * called. - * - * @param obj The entry object - * @param func The function to use as text filter - * @param data User data to pass to @p func - * - * @ingroup Entry - */ EAPI void elm_entry_text_filter_append(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data) { @@ -3016,18 +2523,6 @@ elm_entry_text_filter_append(Evas_Object *obj, void (*func) (void *data, Evas_Ob wd->text_filters = eina_list_append(wd->text_filters, tf); } -/** - * Prepend a filter function for text insdrted in the entry - * - * Prepend the given callback to the list. See elm_entry_text_filter_append() - * for more information - * - * @param obj The entry object - * @param func The function to use as text filter - * @param data User data to pass to @p func - * - * @ingroup Entry - */ EAPI void elm_entry_text_filter_prepend(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data) { @@ -3045,18 +2540,6 @@ elm_entry_text_filter_prepend(Evas_Object *obj, void (*func) (void *data, Evas_O wd->text_filters = eina_list_prepend(wd->text_filters, tf); } -/** - * Remove a filter from the list - * - * Removes the given callback from the filter list. See elm_entry_text_filter_append() - * for more information. - * - * @param obj The entry object - * @param func The filter function to remove - * @param data The user data passed when adding the function - * - * @ingroup Entry - */ EAPI void elm_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data) { @@ -3080,16 +2563,6 @@ elm_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Ob } } -/** - * This converts a markup (HTML-like) string into UTF-8. - * Returning string is obtained with malloc. - * After use the returned string, it should be freed. - * - * @param s The string (in markup) to be converted - * @return The converted string (in UTF-8). It should be freed. - * - * @ingroup Entry - */ EAPI char * elm_entry_markup_to_utf8(const char *s) { @@ -3098,16 +2571,6 @@ elm_entry_markup_to_utf8(const char *s) return ss; } -/** - * This converts a UTF-8 string into markup (HTML-like). - * Returning string is obtained with malloc. - * After use the returned string, it should be freed. - * - * @param s The string (in UTF-8) to be converted - * @return The converted string (in markup). It should be freed. - * - * @ingroup Entry - */ EAPI char * elm_entry_utf8_to_markup(const char *s) { @@ -3116,27 +2579,6 @@ elm_entry_utf8_to_markup(const char *s) return ss; } -/** - * Filter inserted text based on user defined character and byte limits - * - * Add this filter to an entry to limit the characters that it will accept - * based the the contents of the provided Elm_Entry_Filter_Limit_Size. - * The funtion works on the UTF-8 representation of the string, converting - * it from the set markup, thus not accounting for any format in it. - * - * The user must create an Elm_Entry_Filter_Limit_Size structure and pass - * it as data when setting the filter. In it it's possible to set limits - * by character count or bytes (any of them is disabled if 0), and both can - * be set at the same time. In that case, it first checks for characters, - * then bytes. - * - * The function will cut the inserted text in order to allow only the first - * number of characters that are still allowed. The cut is made in - * characters, even when limiting by bytes, in order to always contain - * valid ones and avoid half unicode characters making it in. - * - * @ingroup Entry - */ EAPI void elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text) { @@ -3193,15 +2635,6 @@ elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text) free(current); } -/** - * Filter inserted text based on accepted or rejected sets of characters - * - * Add this filter to an entry to restrict the set of accepted characters - * based on the sets in the provided Elm_Entry_Filter_Accept_Set. - * This structure contains both accepted and rejected sets, but they are - * mutually exclusive. If accepted is set, it will be used, otherwise it - * goes on to the rejected set. - */ EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry __UNUSED__, char **text) { @@ -3259,17 +2692,6 @@ elm_entry_filter_accept_set(void *data, Evas_Object *entry __UNUSED__, char **te *insert = 0; } -/** - * This sets the file (and implicitly loads it) for the text to display and - * then edit. All changes are written back to the file after a short delay if - * the entry object is set to autosave. - * - * @param obj The entry object - * @param file The path to the file to load and save - * @param format The file format - * - * @ingroup Entry - */ EAPI void elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format) { @@ -3287,15 +2709,6 @@ elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format) _load(obj); } -/** - * Gets the file to load and save and the file format - * - * @param obj The entry object - * @param file The path to the file to load and save - * @param format The file format - * - * @ingroup Entry - */ EAPI void elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format) { @@ -3306,14 +2719,6 @@ elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *f if (format) *format = wd->format; } -/** - * This function writes any changes made to the file set with - * elm_entry_file_set() - * - * @param obj The entry object - * - * @ingroup Entry - */ EAPI void elm_entry_file_save(Evas_Object *obj) { @@ -3329,14 +2734,6 @@ elm_entry_file_save(Evas_Object *obj) wd->delay_write = ecore_timer_add(2.0, _delay_write, obj); } -/** - * This sets the entry object to 'autosave' the loaded text file or not. - * - * @param obj The entry object - * @param autosave Autosave the loaded file or not - * - * @ingroup Entry - */ EAPI void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave) { @@ -3346,14 +2743,6 @@ elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave) wd->autosave = !!autosave; } -/** - * This gets the entry object's 'autosave' status. - * - * @param obj The entry object - * @return Autosave the loaded file or not - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_autosave_get(const Evas_Object *obj) { @@ -3363,19 +2752,6 @@ elm_entry_autosave_get(const Evas_Object *obj) return wd->autosave; } -/** - * Control pasting of text and images for the widget. - * - * Normally the entry allows both text and images to be pasted. By setting - * textonly to be true, this prevents images from being pasted. - * - * Note this only changes the behaviour of text. - * - * @param obj The entry object - * @param textonly paste mode - EINA_TRUE is text only, EINA_FALSE is text+image+other. - * - * @ingroup Entry - */ EAPI void elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly) { @@ -3392,16 +2768,6 @@ elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly) #endif } -/** - * Getting elm_entry text paste/drop mode. - * - * In textonly mode, only text may be pasted or dropped into the widget. - * - * @param obj The entry object - * @return If the widget only accepts text from pastes. - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_cnp_textonly_get(const Evas_Object *obj) { @@ -3411,16 +2777,6 @@ elm_entry_cnp_textonly_get(const Evas_Object *obj) return wd->textonly; } -/** - * Enable or disable scrolling in entry - * - * Normally the entry is not scrollable unless you enable it with this call. - * - * @param obj The entry object - * @param scroll EINA_TRUE if it is to be scrollable, EINA_FALSE otherwise - * - * @ingroup Entry - */ EAPI void elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scroll) { @@ -3453,17 +2809,6 @@ elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scroll) _theme_hook(obj); } -/** - * Get the scrollable state of the entry - * - * Normally the entry is not scrollable. This gets the scrollable state - * of the entry. See elm_entry_scrollable_set() for more information. - * - * @param obj The entry object - * @return The scrollable state - * - * @ingroup Entry - */ EAPI Eina_Bool elm_entry_scrollable_get(const Evas_Object *obj) { @@ -3473,20 +2818,6 @@ elm_entry_scrollable_get(const Evas_Object *obj) return wd->scroll; } -/** - * This sets a widget to be displayed to the left of a scrolled entry. - * - * @param obj The scrolled entry object - * @param icon The widget to display on the left side of the scrolled - * entry. - * - * @note A previously set widget will be destroyed. - * @note If the object being set does not have minimum size hints set, - * it won't get properly displayed. - * - * @ingroup Entry - * @see elm_entry_end_set - */ EAPI void elm_entry_icon_set(Evas_Object *obj, Evas_Object *icon) { @@ -3505,15 +2836,6 @@ elm_entry_icon_set(Evas_Object *obj, Evas_Object *icon) _sizing_eval(obj); } -/** - * Gets the leftmost widget of the scrolled entry. This object is - * owned by the scrolled entry and should not be modified. - * - * @param obj The scrolled entry object - * @return the left widget inside the scroller - * - * @ingroup Entry - */ EAPI Evas_Object * elm_entry_icon_get(const Evas_Object *obj) { @@ -3523,18 +2845,6 @@ elm_entry_icon_get(const Evas_Object *obj) return wd->icon; } -/** - * Unset the leftmost widget of the scrolled entry, unparenting and - * returning it. - * - * @param obj The scrolled entry object - * @return the previously set icon sub-object of this entry, on - * success. - * - * @see elm_entry_icon_set() - * - * @ingroup Entry - */ EAPI Evas_Object * elm_entry_icon_unset(Evas_Object *obj) { @@ -3555,16 +2865,6 @@ elm_entry_icon_unset(Evas_Object *obj) return ret; } -/** - * Sets the visibility of the left-side widget of the scrolled entry, - * set by @elm_entry_icon_set(). - * - * @param obj The scrolled entry object - * @param setting EINA_TRUE if the object should be displayed, - * EINA_FALSE if not. - * - * @ingroup Entry - */ EAPI void elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting) { @@ -3578,20 +2878,6 @@ elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting) _sizing_eval(obj); } -/** - * This sets a widget to be displayed to the end of a scrolled entry. - * - * @param obj The scrolled entry object - * @param end The widget to display on the right side of the scrolled - * entry. - * - * @note A previously set widget will be destroyed. - * @note If the object being set does not have minimum size hints set, - * it won't get properly displayed. - * - * @ingroup Entry - * @see elm_entry_icon_set - */ EAPI void elm_entry_end_set(Evas_Object *obj, Evas_Object *end) { @@ -3610,15 +2896,6 @@ elm_entry_end_set(Evas_Object *obj, Evas_Object *end) _sizing_eval(obj); } -/** - * Gets the endmost widget of the scrolled entry. This object is owned - * by the scrolled entry and should not be modified. - * - * @param obj The scrolled entry object - * @return the right widget inside the scroller - * - * @ingroup Entry - */ EAPI Evas_Object * elm_entry_end_get(const Evas_Object *obj) { @@ -3628,18 +2905,6 @@ elm_entry_end_get(const Evas_Object *obj) return wd->end; } -/** - * Unset the endmost widget of the scrolled entry, unparenting and - * returning it. - * - * @param obj The scrolled entry object - * @return the previously set icon sub-object of this entry, on - * success. - * - * @see elm_entry_icon_set() - * - * @ingroup Entry - */ EAPI Evas_Object * elm_entry_end_unset(Evas_Object *obj) { @@ -3660,16 +2925,6 @@ elm_entry_end_unset(Evas_Object *obj) return ret; } -/** - * Sets the visibility of the end widget of the scrolled entry, set by - * @elm_entry_end_set(). - * - * @param obj The scrolled entry object - * @param setting EINA_TRUE if the object should be displayed, - * EINA_FALSE if not. - * - * @ingroup Entry - */ EAPI void elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting) { @@ -3683,15 +2938,6 @@ elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting) _sizing_eval(obj); } -/** - * This sets the scrolled entry's scrollbar policy (ie. enabling/disabling them). - * - * @param obj The scrolled entry object - * @param h The horizontal scrollbar policy to apply - * @param v The vertical scrollbar policy to apply - * - * @ingroup Entry - */ EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v) { @@ -3711,15 +2957,6 @@ elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scro map[wd->policy_v]); } -/** - * This enables/disables bouncing within the entry. - * - * @param obj The scrolled entry object - * @param h The horizontal bounce state - * @param v The vertical bounce state - * - * @ingroup Entry - */ EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) { @@ -3729,15 +2966,6 @@ elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) elm_smart_scroller_bounce_allow_set(wd->scroller, h_bounce, v_bounce); } -/** - * Get the bounce mode - * - * @param obj The Entry object - * @param h_bounce Allow bounce horizontally - * @param v_bounce Allow bounce vertically - * - * @ingroup Entry - */ EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) {