enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

elm gen/gengrid/genlist: Undeprecate some gengrid/genlist APIs and 

deprecate all elm_gen APIs.

We will merge gengrid into genlist later and remove elm_gen.
I updated http://trac.enlightenment.org/e/wiki/ElementaryChanges
I will fix other libraries/programs in trunk soon.


SVN revision: 65700
This commit is contained in:
Daniel Juyung Seo 2011-11-30 00:59:19 +00:00
parent 192938a19a
commit 6f1dd8c84d
5 changed files with 147 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
legacy/elementary/src/lib/Elementary.h.in
View File

@ -8000,27 +8000,28 @@ extern "C" {
Elm_Gen_Item_Del_Cb del; Elm_Gen_Item_Del_Cb del;
} func; } func;
}; };
EAPI void elm_gen_clear(Evas_Object *obj); EINA_DEPRECATED EAPI void elm_gen_clear(Evas_Object *obj);
EAPI void elm_gen_item_selected_set(Elm_Gen_Item *it, Eina_Bool selected); EINA_DEPRECATED EAPI void elm_gen_item_selected_set(Elm_Gen_Item *it, Eina_Bool selected);
EAPI Eina_Bool elm_gen_item_selected_get(const Elm_Gen_Item *it); EINA_DEPRECATED EAPI Eina_Bool elm_gen_item_selected_get(const Elm_Gen_Item *it);
EAPI void elm_gen_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); EINA_DEPRECATED EAPI void elm_gen_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
EAPI Eina_Bool elm_gen_always_select_mode_get(const Evas_Object *obj); EINA_DEPRECATED EAPI Eina_Bool elm_gen_always_select_mode_get(const Evas_Object *obj);
EAPI void elm_gen_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select); EINA_DEPRECATED EAPI void elm_gen_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
EAPI Eina_Bool elm_gen_no_select_mode_get(const Evas_Object *obj); EINA_DEPRECATED EAPI Eina_Bool elm_gen_no_select_mode_get(const Evas_Object *obj);
EAPI void elm_gen_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); EINA_DEPRECATED EAPI void elm_gen_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
EAPI void elm_gen_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); EINA_DEPRECATED EAPI void elm_gen_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
EAPI void elm_gen_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel); EINA_DEPRECATED EAPI void elm_gen_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
EAPI void elm_gen_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel); EINA_DEPRECATED EAPI void elm_gen_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel);
EAPI void elm_gen_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
EAPI void elm_gen_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber); EINA_DEPRECATED EAPI void elm_gen_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
EAPI void elm_gen_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber); EINA_DEPRECATED EAPI void elm_gen_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
EAPI void elm_gen_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber); EINA_DEPRECATED EAPI void elm_gen_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
EAPI void elm_gen_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber); EINA_DEPRECATED EAPI void elm_gen_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber);
EAPI Elm_Gen_Item *elm_gen_first_item_get(const Evas_Object *obj); EINA_DEPRECATED EAPI void elm_gen_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber);
EAPI Elm_Gen_Item *elm_gen_last_item_get(const Evas_Object *obj); EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_first_item_get(const Evas_Object *obj);
EAPI Elm_Gen_Item *elm_gen_item_next_get(const Elm_Gen_Item *it); EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_last_item_get(const Evas_Object *obj);
EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it); EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_item_next_get(const Elm_Gen_Item *it);
EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *it); EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it);
EINA_DEPRECATED EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *it);
/** /**
* @defgroup Gengrid Gengrid (Generic grid) * @defgroup Gengrid Gengrid (Generic grid)
@ -8613,7 +8614,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1);
/** /**
* Get whether items on a given gengrid widget have their selection * Get whether items on a given gengrid widget have their selection
@ -8628,7 +8629,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Set whether items on a given gengrid widget can be selected or not. * Set whether items on a given gengrid widget can be selected or not.
@ -8646,7 +8647,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1);
/** /**
* Get whether items on a given gengrid widget can be selected or * Get whether items on a given gengrid widget can be selected or
@ -8660,7 +8661,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Eina_Bool elm_gengrid_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_gengrid_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Enable or disable multi-selection in a given gengrid widget * Enable or disable multi-selection in a given gengrid widget
@ -8718,7 +8719,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1);
/** /**
* Get whether bouncing effects are enabled or disabled, for a * Get whether bouncing effects are enabled or disabled, for a
@ -8734,7 +8735,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1);
/** /**
* Set a given gengrid widget's scrolling page size, relative to * Set a given gengrid widget's scrolling page size, relative to
@ -8768,7 +8769,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel) EINA_ARG_NONNULL(1);
/** /**
* Get a given gengrid widget's scrolling page size, relative to * Get a given gengrid widget's scrolling page size, relative to
@ -8784,7 +8785,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel) EINA_ARG_NONNULL(1);
/** /**
* Set a given gengrid widget's scrolling page size * Set a given gengrid widget's scrolling page size
@ -8812,7 +8813,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize) EINA_ARG_NONNULL(1);
/** /**
* @brief Get gengrid current page number. * @brief Get gengrid current page number.
@ -8830,7 +8831,7 @@ extern "C" {
* @see elm_gengrid_page_show() * @see elm_gengrid_page_show()
* @see elm_gengrid_page_brint_in() * @see elm_gengrid_page_brint_in()
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1);
/** /**
* @brief Get scroll last page number. * @brief Get scroll last page number.
@ -8846,7 +8847,7 @@ extern "C" {
* @see elm_gengrid_page_show() * @see elm_gengrid_page_show()
* @see elm_gengrid_page_brint_in() * @see elm_gengrid_page_brint_in()
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1);
/** /**
* Show a specific virtual region within the gengrid content object by page number. * Show a specific virtual region within the gengrid content object by page number.
@ -8870,7 +8871,7 @@ extern "C" {
* *
* @see elm_gengrid_page_bring_in() * @see elm_gengrid_page_bring_in()
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1);
/** /**
* Show a specific virtual region within the gengrid content object by page number. * Show a specific virtual region within the gengrid content object by page number.
@ -8894,7 +8895,7 @@ extern "C" {
* *
* @see elm_gengrid_page_show() * @see elm_gengrid_page_show()
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1);
/** /**
* Set the direction in which a given gengrid widget will expand while * Set the direction in which a given gengrid widget will expand while
@ -8946,7 +8947,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Elm_Gengrid_Item *elm_gengrid_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Get the last item in a given gengrid widget * Get the last item in a given gengrid widget
@ -8962,7 +8963,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Elm_Gengrid_Item *elm_gengrid_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Get the @b next item in a gengrid widget's internal list of items, * Get the @b next item in a gengrid widget's internal list of items,
@ -8979,7 +8980,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_item_next_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1); EAPI Elm_Gengrid_Item *elm_gengrid_item_next_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Get the @b previous item in a gengrid widget's internal list of items, * Get the @b previous item in a gengrid widget's internal list of items,
@ -8996,7 +8997,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_item_prev_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1); EAPI Elm_Gengrid_Item *elm_gengrid_item_prev_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Get the gengrid object's handle which contains a given gengrid * Get the gengrid object's handle which contains a given gengrid
@ -9009,7 +9010,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Evas_Object *elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Remove a gengrid item from its parent, deleting it. * Remove a gengrid item from its parent, deleting it.
@ -9130,7 +9131,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1);
/** /**
* Get whether a given gengrid item is selected or not * Get whether a given gengrid item is selected or not
@ -9144,7 +9145,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Get the real Evas object created to implement the view of a * Get the real Evas object created to implement the view of a
@ -9487,7 +9488,7 @@ extern "C" {
* *
* @ingroup Gengrid * @ingroup Gengrid
*/ */
EINA_DEPRECATED EAPI void elm_gengrid_clear(Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_gengrid_clear(Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Get the selected item in a given gengrid widget * Get the selected item in a given gengrid widget
@ -18269,7 +18270,7 @@ extern "C" {
* item before another item and elm_genlist_item_insert_after() inserts after * item before another item and elm_genlist_item_insert_after() inserts after
* the indicated item. * the indicated item.
* *
* The application can clear the list with elm_gen_clear() which deletes * The application can clear the list with elm_genlist_clear() which deletes
* all the items in the list and elm_genlist_item_del() will delete a specific * all the items in the list and elm_genlist_item_del() will delete a specific
* item. elm_genlist_item_subitems_clear() will clear all items that are * item. elm_genlist_item_subitems_clear() will clear all items that are
* children of the indicated parent item. * children of the indicated parent item.
@ -18327,7 +18328,7 @@ extern "C" {
* *
* Items will only call their selection func and callback when first becoming * Items will only call their selection func and callback when first becoming
* selected. Any further clicks will do nothing, unless you enable always * selected. Any further clicks will do nothing, unless you enable always
* select with elm_gen_always_select_mode_set(). This means even if * select with elm_genlist_always_select_mode_set(). This means even if
* selected, every click will make the selected callbacks be called. * selected, every click will make the selected callbacks be called.
* elm_genlist_no_select_mode_set() will turn off the ability to select * elm_genlist_no_select_mode_set() will turn off the ability to select
* items entirely and they will neither appear selected nor call selected * items entirely and they will neither appear selected nor call selected
@ -18559,7 +18560,7 @@ extern "C" {
* *
* @see elm_genlist_item_append() * @see elm_genlist_item_append()
* @see elm_genlist_item_del() * @see elm_genlist_item_del()
* @see elm_gen_clear() * @see elm_genlist_clear()
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
@ -18571,13 +18572,11 @@ extern "C" {
* *
* This removes (and deletes) all items in @p obj, leaving it empty. * This removes (and deletes) all items in @p obj, leaving it empty.
* *
* This is deprecated. Please use elm_gen_clear() instead.
*
* @see elm_genlist_item_del(), to remove just one item. * @see elm_genlist_item_del(), to remove just one item.
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI void elm_genlist_clear(Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_genlist_clear(Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Enable or disable multi-selection in the genlist * Enable or disable multi-selection in the genlist
* *
@ -18648,17 +18647,15 @@ extern "C" {
* *
* Items will only call their selection func and callback when first * Items will only call their selection func and callback when first
* becoming selected. Any further clicks will do nothing, unless you * becoming selected. Any further clicks will do nothing, unless you
* enable always select with elm_gen_always_select_mode_set(). * enable always select with elm_genlist_always_select_mode_set().
* This means that, even if selected, every click will make the selected * This means that, even if selected, every click will make the selected
* callbacks be called. * callbacks be called.
* *
* This function is deprecated. please see elm_gen_always_select_mode_set()
*
* @see elm_genlist_always_select_mode_get() * @see elm_genlist_always_select_mode_get()
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1); EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1);
/** /**
* Get the always select mode. * Get the always select mode.
* *
@ -18670,7 +18667,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Eina_Bool elm_genlist_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_genlist_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Enable/disable the no select mode. * Enable/disable the no select mode.
* *
@ -18685,7 +18682,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1); EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1);
/** /**
* Gets whether the no select mode is enabled. * Gets whether the no select mode is enabled.
* *
@ -18697,7 +18694,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Eina_Bool elm_genlist_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_genlist_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Enable/disable compress mode. * Enable/disable compress mode.
* *
@ -18779,7 +18776,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1); EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1);
/** /**
* Get whether the horizontal and vertical bouncing effect is enabled. * Get whether the horizontal and vertical bouncing effect is enabled.
* *
@ -18793,7 +18790,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1); EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1);
/** /**
* Enable/disable homogeneous mode. * Enable/disable homogeneous mode.
* *
@ -19111,7 +19108,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Get the last item in the genlist * Get the last item in the genlist
* *
@ -19121,7 +19118,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/** /**
* Set the scrollbar policy * Set the scrollbar policy
* *
@ -19169,7 +19166,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Get the @b previous item in a genlist widget's internal list of items, * Get the @b previous item in a genlist widget's internal list of items,
* given a handle to one of those items. * given a handle to one of those items.
@ -19185,7 +19182,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Get the genlist object's handle which contains a given genlist * Get the genlist object's handle which contains a given genlist
* item * item
@ -19195,11 +19192,9 @@ extern "C" {
* *
* This returns the genlist object itself that an item belongs to. * This returns the genlist object itself that an item belongs to.
* *
* This function is deprecated. Please use elm_gen_item_widget_get()
*
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Get the parent item of the given item * Get the parent item of the given item
* *
@ -19242,7 +19237,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1); EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1);
/** /**
* Get whether a given genlist item is selected or not * Get whether a given genlist item is selected or not
* *
@ -19253,7 +19248,7 @@ extern "C" {
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EINA_DEPRECATED EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
/** /**
* Sets the expanded state of an item. * Sets the expanded state of an item.
* *

4
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -630,8 +630,8 @@ _signal_first(Widget_Request *wr)
evas_object_smart_callback_call(wr->obj, SIG_DIRECTORY_OPEN, (void *)wr->path); evas_object_smart_callback_call(wr->obj, SIG_DIRECTORY_OPEN, (void *)wr->path);
if (!wr->parent) if (!wr->parent)
{ {
elm_gen_clear(wr->wd->files_list); elm_genlist_clear(wr->wd->files_list);
elm_gen_clear(wr->wd->files_grid); elm_gengrid_clear(wr->wd->files_grid);
eina_stringshare_replace(&wr->wd->path, wr->path); eina_stringshare_replace(&wr->wd->path, wr->path);
_do_anchors(wr->obj, wr->path); _do_anchors(wr->obj, wr->path);
} }

88
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -272,14 +272,14 @@ _event_hook(Evas_Object *obj,
} }
else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home")))
{ {
it = elm_gen_first_item_get(obj); it = elm_gengrid_first_item_get(obj);
elm_gengrid_item_bring_in(it); elm_gengrid_item_bring_in(it);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE; return EINA_TRUE;
} }
else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
{ {
it = elm_gen_last_item_get(obj); it = elm_gengrid_last_item_get(obj);
elm_gengrid_item_bring_in(it); elm_gengrid_item_bring_in(it);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE; return EINA_TRUE;
@ -343,7 +343,7 @@ _deselect_all_items(Widget_Data *wd)
{ {
if (!wd->selected) return EINA_FALSE; if (!wd->selected) return EINA_FALSE;
while (wd->selected) while (wd->selected)
elm_gen_item_selected_set(wd->selected->data, EINA_FALSE); elm_gengrid_item_selected_set(wd->selected->data, EINA_FALSE);
return EINA_TRUE; return EINA_TRUE;
} }
@ -353,17 +353,17 @@ _item_multi_select_left(Widget_Data *wd)
{ {
if (!wd->selected) return EINA_FALSE; if (!wd->selected) return EINA_FALSE;
Elm_Gen_Item *prev = elm_gen_item_prev_get(wd->last_selected_item); Elm_Gen_Item *prev = elm_gengrid_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_TRUE; if (!prev) return EINA_TRUE;
if (elm_gen_item_selected_get(prev)) if (elm_gengrid_item_selected_get(prev))
{ {
elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = prev; wd->last_selected_item = prev;
elm_gengrid_item_show(wd->last_selected_item); elm_gengrid_item_show(wd->last_selected_item);
} }
else else
{ {
elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev); elm_gengrid_item_show(prev);
} }
@ -375,17 +375,17 @@ _item_multi_select_right(Widget_Data *wd)
{ {
if (!wd->selected) return EINA_FALSE; if (!wd->selected) return EINA_FALSE;
Elm_Gen_Item *next = elm_gen_item_next_get(wd->last_selected_item); Elm_Gen_Item *next = elm_gengrid_item_next_get(wd->last_selected_item);
if (!next) return EINA_TRUE; if (!next) return EINA_TRUE;
if (elm_gen_item_selected_get(next)) if (elm_gengrid_item_selected_get(next))
{ {
elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = next; wd->last_selected_item = next;
elm_gengrid_item_show(wd->last_selected_item); elm_gengrid_item_show(wd->last_selected_item);
} }
else else
{ {
elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next); elm_gengrid_item_show(next);
} }
@ -432,24 +432,24 @@ _item_single_select_up(Widget_Data *wd)
prev = ELM_GEN_ITEM_FROM_INLIST(wd->items->last); prev = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
while ((prev) && (prev->delete_me)) while ((prev) && (prev->delete_me))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev); elm_gengrid_item_show(prev);
return EINA_TRUE; return EINA_TRUE;
} }
else prev = elm_gen_item_prev_get(wd->last_selected_item); else prev = elm_gengrid_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_FALSE; if (!prev) return EINA_FALSE;
for (i = 1; i < wd->nmax; i++) for (i = 1; i < wd->nmax; i++)
{ {
Elm_Gen_Item *tmp = elm_gen_item_prev_get(prev); Elm_Gen_Item *tmp = elm_gengrid_item_prev_get(prev);
if (!tmp) return EINA_FALSE; if (!tmp) return EINA_FALSE;
prev = tmp; prev = tmp;
} }
_deselect_all_items(wd); _deselect_all_items(wd);
elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev); elm_gengrid_item_show(prev);
return EINA_TRUE; return EINA_TRUE;
} }
@ -466,24 +466,24 @@ _item_single_select_down(Widget_Data *wd)
next = ELM_GEN_ITEM_FROM_INLIST(wd->items); next = ELM_GEN_ITEM_FROM_INLIST(wd->items);
while ((next) && (next->delete_me)) while ((next) && (next->delete_me))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next); elm_gengrid_item_show(next);
return EINA_TRUE; return EINA_TRUE;
} }
else next = elm_gen_item_next_get(wd->last_selected_item); else next = elm_gengrid_item_next_get(wd->last_selected_item);
if (!next) return EINA_FALSE; if (!next) return EINA_FALSE;
for (i = 1; i < wd->nmax; i++) for (i = 1; i < wd->nmax; i++)
{ {
Elm_Gen_Item *tmp = elm_gen_item_next_get(next); Elm_Gen_Item *tmp = elm_gengrid_item_next_get(next);
if (!tmp) return EINA_FALSE; if (!tmp) return EINA_FALSE;
next = tmp; next = tmp;
} }
_deselect_all_items(wd); _deselect_all_items(wd);
elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next); elm_gengrid_item_show(next);
return EINA_TRUE; return EINA_TRUE;
} }
@ -498,13 +498,13 @@ _item_single_select_left(Widget_Data *wd)
while ((prev) && (prev->delete_me)) while ((prev) && (prev->delete_me))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
} }
else prev = elm_gen_item_prev_get(wd->last_selected_item); else prev = elm_gengrid_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_FALSE; if (!prev) return EINA_FALSE;
_deselect_all_items(wd); _deselect_all_items(wd);
elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev); elm_gengrid_item_show(prev);
return EINA_TRUE; return EINA_TRUE;
} }
@ -519,13 +519,13 @@ _item_single_select_right(Widget_Data *wd)
while ((next) && (next->delete_me)) while ((next) && (next->delete_me))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
} }
else next = elm_gen_item_next_get(wd->last_selected_item); else next = elm_gengrid_item_next_get(wd->last_selected_item);
if (!next) return EINA_FALSE; if (!next) return EINA_FALSE;
_deselect_all_items(wd); _deselect_all_items(wd);
elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next); elm_gengrid_item_show(next);
return EINA_TRUE; return EINA_TRUE;
} }
@ -584,7 +584,7 @@ _del_pre_hook(Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
elm_gen_clear(obj); elm_gengrid_clear(obj);
evas_object_del(wd->pan_smart); evas_object_del(wd->pan_smart);
wd->pan_smart = NULL; wd->pan_smart = NULL;
} }
@ -2210,7 +2210,7 @@ elm_gengrid_horizontal_get(const Evas_Object *obj)
EAPI void EAPI void
elm_gengrid_clear(Evas_Object *obj) elm_gengrid_clear(Evas_Object *obj)
{ {
elm_gen_clear(obj); elm_gengrid_clear(obj);
} }
EAPI const Evas_Object * EAPI const Evas_Object *
@ -2317,7 +2317,7 @@ EAPI void
elm_gengrid_item_selected_set(Elm_Gen_Item *it, elm_gengrid_item_selected_set(Elm_Gen_Item *it,
Eina_Bool selected) Eina_Bool selected)
{ {
elm_gen_item_selected_set(it, selected); elm_gengrid_item_selected_set(it, selected);
} }
EAPI Eina_Bool EAPI Eina_Bool
@ -2549,26 +2549,26 @@ EAPI void
elm_gengrid_always_select_mode_set(Evas_Object *obj, elm_gengrid_always_select_mode_set(Evas_Object *obj,
Eina_Bool always_select) Eina_Bool always_select)
{ {
elm_gen_always_select_mode_set(obj, always_select); elm_gengrid_always_select_mode_set(obj, always_select);
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_gengrid_always_select_mode_get(const Evas_Object *obj) elm_gengrid_always_select_mode_get(const Evas_Object *obj)
{ {
return elm_gen_always_select_mode_get(obj); return elm_gengrid_always_select_mode_get(obj);
} }
EAPI void EAPI void
elm_gengrid_no_select_mode_set(Evas_Object *obj, elm_gengrid_no_select_mode_set(Evas_Object *obj,
Eina_Bool no_select) Eina_Bool no_select)
{ {
elm_gen_no_select_mode_set(obj, no_select); elm_gengrid_no_select_mode_set(obj, no_select);
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_gengrid_no_select_mode_get(const Evas_Object *obj) elm_gengrid_no_select_mode_get(const Evas_Object *obj)
{ {
return elm_gen_no_select_mode_get(obj); return elm_gengrid_no_select_mode_get(obj);
} }
EAPI void EAPI void
@ -2576,7 +2576,7 @@ elm_gengrid_bounce_set(Evas_Object *obj,
Eina_Bool h_bounce, Eina_Bool h_bounce,
Eina_Bool v_bounce) Eina_Bool v_bounce)
{ {
elm_gen_bounce_set(obj, h_bounce, v_bounce); elm_gengrid_bounce_set(obj, h_bounce, v_bounce);
} }
EAPI void EAPI void
@ -2584,7 +2584,7 @@ elm_gengrid_bounce_get(const Evas_Object *obj,
Eina_Bool *h_bounce, Eina_Bool *h_bounce,
Eina_Bool *v_bounce) Eina_Bool *v_bounce)
{ {
return elm_gen_bounce_get(obj, h_bounce, v_bounce); return elm_gengrid_bounce_get(obj, h_bounce, v_bounce);
} }
EAPI void EAPI void
@ -2592,13 +2592,13 @@ elm_gengrid_page_relative_set(Evas_Object *obj,
double h_pagerel, double h_pagerel,
double v_pagerel) double v_pagerel)
{ {
elm_gen_page_relative_set(obj, h_pagerel, v_pagerel); elm_gengrid_page_relative_set(obj, h_pagerel, v_pagerel);
} }
EAPI void EAPI void
elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel) elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel)
{ {
elm_gen_page_relative_get(obj, h_pagerel, v_pagerel); elm_gengrid_page_relative_get(obj, h_pagerel, v_pagerel);
} }
EAPI void EAPI void
@ -2606,61 +2606,61 @@ elm_gengrid_page_size_set(Evas_Object *obj,
Evas_Coord h_pagesize, Evas_Coord h_pagesize,
Evas_Coord v_pagesize) Evas_Coord v_pagesize)
{ {
elm_gen_page_size_set(obj, h_pagesize, v_pagesize); elm_gengrid_page_size_set(obj, h_pagesize, v_pagesize);
} }
EAPI void EAPI void
elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber)
{ {
elm_gen_current_page_get(obj, h_pagenumber, v_pagenumber); elm_gengrid_current_page_get(obj, h_pagenumber, v_pagenumber);
} }
EAPI void EAPI void
elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber)
{ {
elm_gen_last_page_get(obj, h_pagenumber, v_pagenumber); elm_gengrid_last_page_get(obj, h_pagenumber, v_pagenumber);
} }
EAPI void EAPI void
elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber)
{ {
elm_gen_page_show(obj, h_pagenumber, v_pagenumber); elm_gengrid_page_show(obj, h_pagenumber, v_pagenumber);
} }
EAPI void EAPI void
elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber)
{ {
elm_gen_page_bring_in(obj, h_pagenumber, v_pagenumber); elm_gengrid_page_bring_in(obj, h_pagenumber, v_pagenumber);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_gengrid_first_item_get(const Evas_Object *obj) elm_gengrid_first_item_get(const Evas_Object *obj)
{ {
return elm_gen_first_item_get(obj); return elm_gengrid_first_item_get(obj);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_gengrid_last_item_get(const Evas_Object *obj) elm_gengrid_last_item_get(const Evas_Object *obj)
{ {
return elm_gen_last_item_get(obj); return elm_gengrid_last_item_get(obj);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_gengrid_item_next_get(const Elm_Gen_Item *it) elm_gengrid_item_next_get(const Elm_Gen_Item *it)
{ {
return elm_gen_item_next_get(it); return elm_gengrid_item_next_get(it);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_gengrid_item_prev_get(const Elm_Gen_Item *it) elm_gengrid_item_prev_get(const Elm_Gen_Item *it)
{ {
return elm_gen_item_prev_get(it); return elm_gengrid_item_prev_get(it);
} }
EAPI Evas_Object * EAPI Evas_Object *
elm_gengrid_item_gengrid_get(const Elm_Gen_Item *it) elm_gengrid_item_gengrid_get(const Elm_Gen_Item *it)
{ {
return elm_gen_item_widget_get(it); return elm_gengrid_item_gengrid_get(it);
} }
EAPI void EAPI void

74
legacy/elementary/src/lib/elm_genlist.c
View File

@ -76,9 +76,9 @@ struct _Widget_Data
int minw, minh; int minw, minh;
long count; long count;
Evas_Coord pan_x, pan_y; Evas_Coord pan_x, pan_y;
Eina_Bool reorder_mode : 1; Eina_Bool reorder_mode : 1; /* a flag for reorder mode enable/disable */
Eina_Bool on_hold : 1; Eina_Bool on_hold : 1;
Eina_Bool multi : 1; Eina_Bool multi : 1; /* a flag for item multi selection */
Eina_Bool no_select : 1; Eina_Bool no_select : 1;
Eina_Bool wasselected : 1; Eina_Bool wasselected : 1;
Eina_Bool always_select : 1; Eina_Bool always_select : 1;
@ -351,14 +351,14 @@ _event_hook(Evas_Object *obj,
} }
else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home")))
{ {
it = elm_gen_first_item_get(obj); it = elm_genlist_first_item_get(obj);
elm_genlist_item_bring_in(it); elm_genlist_item_bring_in(it);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE; return EINA_TRUE;
} }
else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
{ {
it = elm_gen_last_item_get(obj); it = elm_genlist_last_item_get(obj);
elm_genlist_item_bring_in(it); elm_genlist_item_bring_in(it);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE; return EINA_TRUE;
@ -410,7 +410,7 @@ _deselect_all_items(Widget_Data *wd)
{ {
if (!wd->selected) return EINA_FALSE; if (!wd->selected) return EINA_FALSE;
while (wd->selected) while (wd->selected)
elm_gen_item_selected_set(wd->selected->data, EINA_FALSE); elm_genlist_item_selected_set(wd->selected->data, EINA_FALSE);
return EINA_TRUE; return EINA_TRUE;
} }
@ -421,18 +421,18 @@ _item_multi_select_up(Widget_Data *wd)
if (!wd->selected) return EINA_FALSE; if (!wd->selected) return EINA_FALSE;
if (!wd->multi) return EINA_FALSE; if (!wd->multi) return EINA_FALSE;
Elm_Gen_Item *prev = elm_gen_item_prev_get(wd->last_selected_item); Elm_Gen_Item *prev = elm_genlist_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_TRUE; if (!prev) return EINA_TRUE;
if (elm_gen_item_selected_get(prev)) if (elm_genlist_item_selected_get(prev))
{ {
elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); elm_genlist_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = prev; wd->last_selected_item = prev;
elm_genlist_item_show(wd->last_selected_item); elm_genlist_item_show(wd->last_selected_item);
} }
else else
{ {
elm_gen_item_selected_set(prev, EINA_TRUE); elm_genlist_item_selected_set(prev, EINA_TRUE);
elm_genlist_item_show(prev); elm_genlist_item_show(prev);
} }
return EINA_TRUE; return EINA_TRUE;
@ -444,18 +444,18 @@ _item_multi_select_down(Widget_Data *wd)
if (!wd->selected) return EINA_FALSE; if (!wd->selected) return EINA_FALSE;
if (!wd->multi) return EINA_FALSE; if (!wd->multi) return EINA_FALSE;
Elm_Gen_Item *next = elm_gen_item_next_get(wd->last_selected_item); Elm_Gen_Item *next = elm_genlist_item_next_get(wd->last_selected_item);
if (!next) return EINA_TRUE; if (!next) return EINA_TRUE;
if (elm_gen_item_selected_get(next)) if (elm_genlist_item_selected_get(next))
{ {
elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); elm_genlist_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = next; wd->last_selected_item = next;
elm_genlist_item_show(wd->last_selected_item); elm_genlist_item_show(wd->last_selected_item);
} }
else else
{ {
elm_gen_item_selected_set(next, EINA_TRUE); elm_genlist_item_selected_set(next, EINA_TRUE);
elm_genlist_item_show(next); elm_genlist_item_show(next);
} }
return EINA_TRUE; return EINA_TRUE;
@ -471,13 +471,13 @@ _item_single_select_up(Widget_Data *wd)
while ((prev) && (prev->delete_me)) while ((prev) && (prev->delete_me))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
} }
else prev = elm_gen_item_prev_get(wd->last_selected_item); else prev = elm_genlist_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_FALSE; if (!prev) return EINA_FALSE;
_deselect_all_items(wd); _deselect_all_items(wd);
elm_gen_item_selected_set(prev, EINA_TRUE); elm_genlist_item_selected_set(prev, EINA_TRUE);
elm_genlist_item_show(prev); elm_genlist_item_show(prev);
return EINA_TRUE; return EINA_TRUE;
} }
@ -492,13 +492,13 @@ _item_single_select_down(Widget_Data *wd)
while ((next) && (next->delete_me)) while ((next) && (next->delete_me))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
} }
else next = elm_gen_item_next_get(wd->last_selected_item); else next = elm_genlist_item_next_get(wd->last_selected_item);
if (!next) return EINA_FALSE; if (!next) return EINA_FALSE;
_deselect_all_items(wd); _deselect_all_items(wd);
elm_gen_item_selected_set(next, EINA_TRUE); elm_genlist_item_selected_set(next, EINA_TRUE);
elm_genlist_item_show(next); elm_genlist_item_show(next);
return EINA_TRUE; return EINA_TRUE;
} }
@ -544,7 +544,7 @@ _del_pre_hook(Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
elm_gen_clear(obj); elm_genlist_clear(obj);
evas_object_del(wd->pan_smart); evas_object_del(wd->pan_smart);
wd->pan_smart = NULL; wd->pan_smart = NULL;
} }
@ -3703,7 +3703,7 @@ elm_genlist_item_sorted_insert(Evas_Object *obj,
EAPI void EAPI void
elm_genlist_clear(Evas_Object *obj) elm_genlist_clear(Evas_Object *obj)
{ {
elm_gen_clear(obj); elm_genlist_clear(obj);
} }
EAPI void EAPI void
@ -3828,31 +3828,31 @@ elm_genlist_at_xy_item_get(const Evas_Object *obj,
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_genlist_first_item_get(const Evas_Object *obj) elm_genlist_first_item_get(const Evas_Object *obj)
{ {
return elm_gen_first_item_get(obj); return elm_genlist_first_item_get(obj);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_genlist_last_item_get(const Evas_Object *obj) elm_genlist_last_item_get(const Evas_Object *obj)
{ {
return elm_gen_last_item_get(obj); return elm_genlist_last_item_get(obj);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_genlist_item_next_get(const Elm_Gen_Item *it) elm_genlist_item_next_get(const Elm_Gen_Item *it)
{ {
return elm_gen_item_next_get(it); return elm_genlist_item_next_get(it);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
elm_genlist_item_prev_get(const Elm_Gen_Item *it) elm_genlist_item_prev_get(const Elm_Gen_Item *it)
{ {
return elm_gen_item_prev_get(it); return elm_genlist_item_prev_get(it);
} }
EAPI Evas_Object * EAPI Evas_Object *
elm_genlist_item_genlist_get(const Elm_Gen_Item *it) elm_genlist_item_genlist_get(const Elm_Gen_Item *it)
{ {
return elm_gen_item_widget_get(it); return elm_genlist_item_genlist_get(it);
} }
EAPI Elm_Gen_Item * EAPI Elm_Gen_Item *
@ -3879,13 +3879,13 @@ EAPI void
elm_genlist_item_selected_set(Elm_Gen_Item *it, elm_genlist_item_selected_set(Elm_Gen_Item *it,
Eina_Bool selected) Eina_Bool selected)
{ {
elm_gen_item_selected_set(it, selected); elm_genlist_item_selected_set(it, selected);
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_genlist_item_selected_get(const Elm_Gen_Item *it) elm_genlist_item_selected_get(const Elm_Gen_Item *it)
{ {
return elm_gen_item_selected_get(it); return elm_genlist_item_selected_get(it);
} }
EAPI void EAPI void
@ -3937,7 +3937,7 @@ elm_genlist_item_disabled_set(Elm_Gen_Item *it,
if (it->delete_me) return; if (it->delete_me) return;
it->disabled = !!disabled; it->disabled = !!disabled;
if (it->selected) if (it->selected)
elm_gen_item_selected_set(it, EINA_FALSE); elm_genlist_item_selected_set(it, EINA_FALSE);
if (it->realized) if (it->realized)
{ {
if (it->disabled) if (it->disabled)
@ -4011,7 +4011,7 @@ elm_genlist_item_promote(Elm_Gen_Item *it)
{ {
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it); ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (it->delete_me) return; if (it->delete_me) return;
_item_move_before(it, elm_gen_first_item_get(WIDGET(it))); _item_move_before(it, elm_genlist_first_item_get(WIDGET(it)));
} }
EAPI void EAPI void
@ -4019,7 +4019,7 @@ elm_genlist_item_demote(Elm_Gen_Item *it)
{ {
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it); ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (it->delete_me) return; if (it->delete_me) return;
_item_move_after(it, elm_gen_last_item_get(WIDGET(it))); _item_move_after(it, elm_genlist_last_item_get(WIDGET(it)));
} }
EAPI void EAPI void
@ -4488,26 +4488,26 @@ EAPI void
elm_genlist_always_select_mode_set(Evas_Object *obj, elm_genlist_always_select_mode_set(Evas_Object *obj,
Eina_Bool always_select) Eina_Bool always_select)
{ {
elm_gen_always_select_mode_set(obj, always_select); elm_genlist_always_select_mode_set(obj, always_select);
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_genlist_always_select_mode_get(const Evas_Object *obj) elm_genlist_always_select_mode_get(const Evas_Object *obj)
{ {
return elm_gen_always_select_mode_get(obj); return elm_genlist_always_select_mode_get(obj);
} }
EAPI void EAPI void
elm_genlist_no_select_mode_set(Evas_Object *obj, elm_genlist_no_select_mode_set(Evas_Object *obj,
Eina_Bool no_select) Eina_Bool no_select)
{ {
elm_gen_no_select_mode_set(obj, no_select); elm_genlist_no_select_mode_set(obj, no_select);
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_genlist_no_select_mode_get(const Evas_Object *obj) elm_genlist_no_select_mode_get(const Evas_Object *obj)
{ {
return elm_gen_no_select_mode_get(obj); return elm_genlist_no_select_mode_get(obj);
} }
EAPI void EAPI void
@ -4559,7 +4559,7 @@ elm_genlist_bounce_set(Evas_Object *obj,
Eina_Bool h_bounce, Eina_Bool h_bounce,
Eina_Bool v_bounce) Eina_Bool v_bounce)
{ {
elm_gen_bounce_set(obj, h_bounce, v_bounce); elm_genlist_bounce_set(obj, h_bounce, v_bounce);
} }
EAPI void EAPI void
@ -4567,7 +4567,7 @@ elm_genlist_bounce_get(const Evas_Object *obj,
Eina_Bool *h_bounce, Eina_Bool *h_bounce,
Eina_Bool *v_bounce) Eina_Bool *v_bounce)
{ {
elm_gen_bounce_get(obj, h_bounce, v_bounce); elm_genlist_bounce_get(obj, h_bounce, v_bounce);
} }
EAPI void EAPI void
@ -4696,13 +4696,13 @@ elm_genlist_item_mode_set(Elm_Gen_Item *it,
{ {
EINA_LIST_FOREACH(wd->selected, l, it2) EINA_LIST_FOREACH(wd->selected, l, it2)
if (it2->realized) if (it2->realized)
elm_gen_item_selected_set(it2, EINA_FALSE); elm_genlist_item_selected_set(it2, EINA_FALSE);
} }
else else
{ {
it2 = elm_genlist_selected_item_get(wd->obj); it2 = elm_genlist_selected_item_get(wd->obj);
if ((it2) && (it2->realized)) if ((it2) && (it2->realized))
elm_gen_item_selected_set(it2, EINA_FALSE); elm_genlist_item_selected_set(it2, EINA_FALSE);
} }
if (((wd->mode_type) && (strcmp(mode_type, wd->mode_type))) || if (((wd->mode_type) && (strcmp(mode_type, wd->mode_type))) ||

6
legacy/elementary/src/lib/elm_store.c
View File

@ -561,7 +561,7 @@ elm_store_free(Elm_Store *st)
evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st); evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
evas_object_smart_callback_del(st->genlist, "realized", _store_genlist_item_realized); evas_object_smart_callback_del(st->genlist, "realized", _store_genlist_item_realized);
evas_object_smart_callback_del(st->genlist, "unrealized", _store_genlist_item_unrealized); evas_object_smart_callback_del(st->genlist, "unrealized", _store_genlist_item_unrealized);
elm_gen_clear(st->genlist); elm_genlist_clear(st->genlist);
st->genlist = NULL; st->genlist = NULL;
} }
if (st->free) st->free(st); if (st->free) st->free(st);
@ -578,14 +578,14 @@ elm_store_target_genlist_set(Elm_Store *st, Evas_Object *obj)
evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st); evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
evas_object_smart_callback_del(st->genlist, "realized", _store_genlist_item_realized); evas_object_smart_callback_del(st->genlist, "realized", _store_genlist_item_realized);
evas_object_smart_callback_del(st->genlist, "unrealized", _store_genlist_item_unrealized); evas_object_smart_callback_del(st->genlist, "unrealized", _store_genlist_item_unrealized);
elm_gen_clear(st->genlist); elm_genlist_clear(st->genlist);
} }
st->genlist = obj; st->genlist = obj;
if (!st->genlist) return; if (!st->genlist) return;
evas_object_smart_callback_add(st->genlist, "realized", _store_genlist_item_realized, st); evas_object_smart_callback_add(st->genlist, "realized", _store_genlist_item_realized, st);
evas_object_smart_callback_add(st->genlist, "unrealized", _store_genlist_item_unrealized, st); evas_object_smart_callback_add(st->genlist, "unrealized", _store_genlist_item_unrealized, st);
evas_object_event_callback_add(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st); evas_object_event_callback_add(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
elm_gen_clear(st->genlist); elm_genlist_clear(st->genlist);
} }
EAPI void EAPI void