From 38c3e0891db1d57c5fd0f1cca10b26ef58e1a433 Mon Sep 17 00:00:00 2001 From: Jeonghyun Yun Date: Thu, 8 Mar 2012 18:06:40 +0900 Subject: [PATCH] src/lib conflict fixed --- doc/widgets/widget_preview_mapbuf.c | 4 - src/lib/Elementary.h.in | 121 +--- src/lib/Makefile.am | 113 +--- src/lib/elm_access.c | 12 - src/lib/elm_app.h | 16 - src/lib/elm_cache.h | 222 ------ src/lib/elm_debug.h | 4 - src/lib/elm_deprecated.h | 1204 --------------------------------- src/lib/elm_deprecated_before.h | 20 - src/lib/elm_engine.h | 57 -- src/lib/elm_finger.h | 40 -- src/lib/elm_font.c | 43 -- src/lib/elm_general.h | 3 - src/lib/elm_gengrid.c | 904 ------------------------- src/lib/elm_gengrid.h | 1172 ++++---------------------------- src/lib/elm_getting_started.h | 12 - src/lib/elm_grid.c | 29 - src/lib/elm_grid.h | 23 - src/lib/elm_intro.h | 12 - src/lib/elm_mapbuf.c | 4 - src/lib/elm_mapbuf.h | 12 - src/lib/elm_mirroring.h | 20 - src/lib/elm_need.h | 4 - src/lib/elm_object.h | 50 -- src/lib/elm_object_item.h | 142 ---- src/lib/elm_plug.h | 29 - src/lib/elm_priv.h | 15 - src/lib/elm_route.c | 35 - src/lib/elm_route.h | 11 - src/lib/elm_scale.h | 36 - src/lib/elm_theme.c | 34 - src/lib/elm_theme.h | 53 -- src/lib/elm_thumb.c | 11 - src/lib/elm_thumb.h | 22 - src/lib/elm_video.c | 33 - src/lib/elm_video.h | 76 --- src/lib/elm_widget.h | 96 --- src/modules/access_output/Makefile.am | 4 - 38 files changed, 139 insertions(+), 4559 deletions(-) delete mode 100644 src/lib/elm_deprecated_before.h delete mode 100644 src/lib/elm_engine.h diff --git a/doc/widgets/widget_preview_mapbuf.c b/doc/widgets/widget_preview_mapbuf.c index e150182..bc547f0 100644 --- a/doc/widgets/widget_preview_mapbuf.c +++ b/doc/widgets/widget_preview_mapbuf.c @@ -17,11 +17,7 @@ for (i = 0; i < 8; i++) { Evas_Object *ic = elm_icon_add(win); elm_icon_standard_set(ic, "home"); -<<<<<<< HEAD - elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); -======= elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); ->>>>>>> remotes/origin/upstream evas_object_show(ic); elm_table_pack(tb, ic, i, j, 1, 1); } diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 254a302..7edfe27 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -1,11 +1,7 @@ /* This is the primary Elementary header file that includes all other useful * headers. * -<<<<<<< HEAD - * Elementary is distrubted under the LGPLv2 license. Please see the COPYING -======= * Elementary is distributed under the LGPLv2 license. Please see the COPYING ->>>>>>> remotes/origin/upstream * file that was distributed with this source. */ #ifndef ELEMENTARY_H @@ -134,15 +130,9 @@ extern "C" #endif /* docs */ -<<<<<<< HEAD -#include -#include -#include -======= #include // OK #include // OK #include // OK ->>>>>>> remotes/origin/upstream #define ELM_VERSION_MAJOR @VMAJ@ #define ELM_VERSION_MINOR @VMIN@ @@ -158,113 +148,6 @@ typedef struct _Elm_Version EAPI extern Elm_Version *elm_version; /* include these first for general used definitions */ -<<<<<<< HEAD -#include -#include -#include - -/* special widgets - types used elsewhere */ -#include -#include -#include -#include - -/* include deprecated before headers - things may still rely on definitions */ -#include - -/* other includes */ -#include // <-- up to here (1.0 review) -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* include deprecated calls last of all */ -#include -======= #include // OK #include // OK #include // OK @@ -276,6 +159,9 @@ EAPI extern Elm_Version *elm_version; #include // OK /* other includes */ +#include +#include + // Tom Hacohen #include // OK #include // OK @@ -367,7 +253,6 @@ EAPI extern Elm_Version *elm_version; /* include deprecated calls last of all */ #include // OK ->>>>>>> remotes/origin/upstream #ifdef __cplusplus } diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 25462d1..24e8ba3 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -45,24 +45,15 @@ elm_widget.h includesunstabledir = $(includedir)/elementary-@VMAJ@ includesub_HEADERS = \ -<<<<<<< HEAD -elc_anchorblock.h \ -elc_anchorview.h \ -elc_ctxpopup.h \ -======= elc_ctxpopup.h \ elc_dayselector.h \ ->>>>>>> remotes/origin/upstream elc_fileselector_button.h \ elc_fileselector_entry.h \ elc_fileselector.h \ elc_hoversel.h \ elc_multibuttonentry.h \ elc_naviframe.h \ -<<<<<<< HEAD -======= elc_popup.h \ ->>>>>>> remotes/origin/upstream elm_actionslider.h \ elm_app.h \ elm_authors.h \ @@ -75,45 +66,23 @@ elm_calendar.h \ elm_check.h \ elm_clock.h \ elm_cnp.h \ -<<<<<<< HEAD -elm_colorpalette.h \ elm_colorselector.h \ elm_config.h \ elm_conform.h \ elm_controlbar.h \ elm_cursor.h \ -elm_datefield.h \ -elm_dayselector.h \ -elm_debug.h \ -elm_deprecated.h \ -elm_deprecated_before.h \ -elm_diskselector.h \ -elm_engine.h \ -elm_entry.h \ -elm_factory.h \ -======= -elm_colorselector.h \ -elm_config.h \ -elm_conform.h \ -elm_cursor.h \ elm_datetime.h \ elm_debug.h \ elm_deprecated.h \ elm_diskselector.h \ elm_entry.h \ ->>>>>>> remotes/origin/upstream elm_finger.h \ elm_flip.h \ elm_flipselector.h \ elm_focus.h \ -<<<<<<< HEAD -elm_fonts.h \ -elm_frame.h \ -======= elm_font.h \ elm_frame.h \ elm_gen.h \ ->>>>>>> remotes/origin/upstream elm_general.h \ elm_gengrid.h \ elm_genlist.h \ @@ -124,10 +93,6 @@ elm_grid.h \ elm_hover.h \ elm_icon.h \ elm_image.h \ -<<<<<<< HEAD -elm_imageslider.h \ -======= ->>>>>>> remotes/origin/upstream elm_plug.h \ elm_index.h \ elm_intro.h \ @@ -140,28 +105,14 @@ elm_map.h \ elm_menu.h \ elm_mirroring.h \ elm_need.h \ -<<<<<<< HEAD -elm_nocontents.h \ elm_notify.h \ elm_object.h \ elm_object_item.h \ -elm_pagecontrol.h \ -elm_pager.h \ elm_panel.h \ elm_panes.h \ elm_password.h \ elm_photocam.h \ elm_photo.h \ -elm_popup.h \ -======= -elm_notify.h \ -elm_object.h \ -elm_object_item.h \ -elm_panel.h \ -elm_panes.h \ -elm_photocam.h \ -elm_photo.h \ ->>>>>>> remotes/origin/upstream elm_progressbar.h \ elm_radio.h \ elm_route.h \ @@ -173,18 +124,10 @@ elm_separator.h \ elm_slider.h \ elm_slideshow.h \ elm_spinner.h \ -<<<<<<< HEAD -elm_stackedicon.h \ -======= ->>>>>>> remotes/origin/upstream elm_store.h \ elm_table.h \ elm_theme.h \ elm_thumb.h \ -<<<<<<< HEAD -elm_tickernoti.h \ -======= ->>>>>>> remotes/origin/upstream elm_toolbar.h \ elm_tooltip.h \ elm_transit.h \ @@ -195,15 +138,9 @@ includesubdir = $(includedir)/elementary-@VMAJ@/ libelementary_la_SOURCES = \ elm_priv.h \ -<<<<<<< HEAD -elc_anchorblock.c \ -elc_anchorview.c \ -elc_ctxpopup.c \ -======= elc_ctxpopup.c \ elc_dayselector.c \ elc_popup.c \ ->>>>>>> remotes/origin/upstream elc_fileselector_button.c \ elc_fileselector.c \ elc_fileselector_entry.c \ @@ -221,36 +158,18 @@ elm_button.c \ elm_calendar.c \ elm_check.c \ elm_clock.c \ -<<<<<<< HEAD -elm_cnp_helper.c \ -elm_colorpalette.c \ -elm_colorselector.c \ -elm_config.c \ -elm_conform.c \ -elm_controlbar.c \ -elm_datefield.c \ -elm_dayselector.c \ -elm_diskselector.c \ -elm_editfield.c \ -elm_entry.c \ -elm_factory.c \ -======= elm_cnp.c \ elm_colorselector.c \ elm_config.c \ elm_conform.c \ +elm_controlbar.c \ elm_datetime.c \ elm_diskselector.c \ elm_entry.c \ ->>>>>>> remotes/origin/upstream elm_flip.c \ elm_flipselector.c \ elm_font.c \ elm_frame.c \ -<<<<<<< HEAD -elm_gen.c \ -======= ->>>>>>> remotes/origin/upstream elm_gengrid.c \ elm_genlist.c \ elm_gen_common.h \ @@ -260,10 +179,6 @@ elm_grid.c \ elm_hover.c \ elm_icon.c \ elm_image.c \ -<<<<<<< HEAD -elm_imageslider.c \ -======= ->>>>>>> remotes/origin/upstream elm_plug.c \ elm_index.c \ elm_label.c \ @@ -274,47 +189,24 @@ elm_mapbuf.c \ elm_map.c \ elm_menu.c \ elm_module.c \ -<<<<<<< HEAD -elm_nocontents.c \ -elm_notify.c \ -elm_pagecontrol.c \ -======= elm_notify.c \ ->>>>>>> remotes/origin/upstream -elm_pager.c \ elm_panel.c \ elm_panes.c \ elm_photo.c \ elm_photocam.c \ -<<<<<<< HEAD -elm_popup.c \ -======= ->>>>>>> remotes/origin/upstream elm_progressbar.c \ elm_radio.c \ elm_route.c \ elm_scroller.c \ -<<<<<<< HEAD -elm_searchbar.c \ -======= ->>>>>>> remotes/origin/upstream elm_segment_control.c \ elm_separator.c \ elm_slider.c \ elm_slideshow.c \ elm_spinner.c \ -<<<<<<< HEAD -elm_stackedicon.c \ -======= ->>>>>>> remotes/origin/upstream elm_store.c \ elm_table.c \ elm_theme.c \ elm_thumb.c \ -<<<<<<< HEAD -elm_tickernoti.c \ -======= ->>>>>>> remotes/origin/upstream elm_toggle.c \ elm_toolbar.c \ elm_transit.c \ @@ -359,10 +251,7 @@ libelementary_la_LIBADD = \ libelementary_la_LDFLAGS = \ -no-undefined @lt_enable_auto_import@ \ -version-info @version_info@ @release_info@ -<<<<<<< HEAD -======= EXTRA_DIST = \ elm_factory.h \ elm_factory.c ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c index 12c40c7..5dd8ce3 100644 --- a/src/lib/elm_access.c +++ b/src/lib/elm_access.c @@ -237,11 +237,7 @@ _elm_access_callback_set(Elm_Access_Info *ac, int type, Elm_Access_Content_Cb fu } EAPI char * -<<<<<<< HEAD -_elm_access_text_get(Elm_Access_Info *ac, int type, Evas_Object *obj, Elm_Widget_Item *item) -======= _elm_access_text_get(const Elm_Access_Info *ac, int type, Evas_Object *obj, Elm_Widget_Item *item) ->>>>>>> remotes/origin/upstream { Elm_Access_Item *ai; Eina_List *l; @@ -308,21 +304,13 @@ _elm_access_say(const char *txt) } EAPI Elm_Access_Info * -<<<<<<< HEAD -_elm_access_object_get(Evas_Object *obj) -======= _elm_access_object_get(const Evas_Object *obj) ->>>>>>> remotes/origin/upstream { return evas_object_data_get(obj, "_elm_access"); } EAPI Elm_Access_Info * -<<<<<<< HEAD -_elm_access_item_get(Elm_Widget_Item *it) -======= _elm_access_item_get(const Elm_Widget_Item *it) ->>>>>>> remotes/origin/upstream { return it->access; } diff --git a/src/lib/elm_app.h b/src/lib/elm_app.h index 9d7cceb..86dba27 100644 --- a/src/lib/elm_app.h +++ b/src/lib/elm_app.h @@ -78,11 +78,7 @@ EAPI void elm_app_info_set(void *mainfunc, const char *dom, const char *c /** * Provide information on the @b fallback application's binaries -<<<<<<< HEAD - * directory, in scenarios where they get overriden by -======= * directory, in scenarios where they get overridden by ->>>>>>> remotes/origin/upstream * elm_app_info_set(). * * @param dir The path to the default binaries directory (compile time @@ -100,11 +96,7 @@ EAPI void elm_app_compile_bin_dir_set(const char *dir); /** * Provide information on the @b fallback application's libraries -<<<<<<< HEAD - * directory, on scenarios where they get overriden by -======= * directory, on scenarios where they get overridden by ->>>>>>> remotes/origin/upstream * elm_app_info_set(). * * @param dir The path to the default libraries directory (compile @@ -122,11 +114,7 @@ EAPI void elm_app_compile_lib_dir_set(const char *dir); /** * Provide information on the @b fallback application's data -<<<<<<< HEAD - * directory, on scenarios where they get overriden by -======= * directory, on scenarios where they get overridden by ->>>>>>> remotes/origin/upstream * elm_app_info_set(). * * @param dir The path to the default data directory (compile time @@ -144,11 +132,7 @@ EAPI void elm_app_compile_data_dir_set(const char *dir); /** * Provide information on the @b fallback application's locale -<<<<<<< HEAD - * directory, on scenarios where they get overriden by -======= * directory, on scenarios where they get overridden by ->>>>>>> remotes/origin/upstream * elm_app_info_set(). * * @param dir The path to the default locale directory (compile time diff --git a/src/lib/elm_cache.h b/src/lib/elm_cache.h index 2b57653..ef0e602 100644 --- a/src/lib/elm_cache.h +++ b/src/lib/elm_cache.h @@ -23,229 +23,7 @@ * * @ingroup Caches */ -<<<<<<< HEAD -// XXX: rename: elm_cache_all_flush() -EAPI void elm_all_flush(void); - -/** - * Get the configured cache flush interval time - * - * This gets the globally configured cache flush interval time, in - * ticks - * - * @return The cache flush interval time - * @ingroup Caches - * - * @see elm_all_flush() - */ -EAPI int elm_cache_flush_interval_get(void); - -/** - * Set the configured cache flush interval time - * - * This sets the globally configured cache flush interval time, in ticks - * - * @param size The cache flush interval time - * @ingroup Caches - * - * @see elm_all_flush() - */ -EAPI void elm_cache_flush_interval_set(int size); - -/** - * Set the configured cache flush interval time for all applications on the - * display - * - * This sets the globally configured cache flush interval time -- in ticks - * -- for all applications on the display. - * - * @param size The cache flush interval time - * @ingroup Caches - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_cache_flush_interval_all_set(int size); - -/** - * Get the configured cache flush enabled state - * - * This gets the globally configured cache flush state - if it is enabled - * or not. When cache flushing is enabled, elementary will regularly - * (see elm_cache_flush_interval_get() ) flush caches and dump data out of - * memory and allow usage to re-seed caches and data in memory where it - * can do so. An idle application will thus minimise its memory usage as - * data will be freed from memory and not be re-loaded as it is idle and - * not rendering or doing anything graphically right now. - * - * @return The cache flush state - * @ingroup Caches - * - * @see elm_all_flush() - */ -EAPI Eina_Bool elm_cache_flush_enabled_get(void); - -/** - * Set the configured cache flush enabled state - * - * This sets the globally configured cache flush enabled state. - * - * @param enabled The cache flush enabled state - * @ingroup Caches - * - * @see elm_all_flush() - */ -EAPI void elm_cache_flush_enabled_set(Eina_Bool enabled); - -/** - * Set the configured cache flush enabled state for all applications on the - * display - * - * This sets the globally configured cache flush enabled state for all - * applications on the display. - * - * @param enabled The cache flush enabled state - * @ingroup Caches - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_cache_flush_enabled_all_set(Eina_Bool enabled); - -/** - * Get the configured font cache size - * - * This gets the globally configured font cache size, in bytes. - * - * @return The font cache size - * @ingroup Caches - */ -EAPI int elm_font_cache_get(void); - -/** - * Set the configured font cache size - * - * This sets the globally configured font cache size, in bytes - * - * @param size The font cache size - * @ingroup Caches - */ -EAPI void elm_font_cache_set(int size); - -/** - * Set the configured font cache size for all applications on the - * display - * - * This sets the globally configured font cache size -- in bytes - * -- for all applications on the display. - * - * @param size The font cache size - * @ingroup Caches - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_font_cache_all_set(int size); - -/** - * Get the configured image cache size - * - * This gets the globally configured image cache size, in bytes - * - * @return The image cache size - * @ingroup Caches - */ -EAPI int elm_image_cache_get(void); - -/** - * Set the configured image cache size - * - * This sets the globally configured image cache size, in bytes - * - * @param size The image cache size - * @ingroup Caches - */ -EAPI void elm_image_cache_set(int size); - -/** - * Set the configured image cache size for all applications on the - * display - * - * This sets the globally configured image cache size -- in bytes - * -- for all applications on the display. - * - * @param size The image cache size - * @ingroup Caches - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_image_cache_all_set(int size); - -/** - * Get the configured edje file cache size. - * - * This gets the globally configured edje file cache size, in number - * of files. - * - * @return The edje file cache size - * @ingroup Caches - */ -EAPI int elm_edje_file_cache_get(void); - -/** - * Set the configured edje file cache size - * - * This sets the globally configured edje file cache size, in number - * of files. - * - * @param size The edje file cache size - * @ingroup Caches - */ -EAPI void elm_edje_file_cache_set(int size); - -/** - * Set the configured edje file cache size for all applications on the - * display - * - * This sets the globally configured edje file cache size -- in number - * of files -- for all applications on the display. - * - * @param size The edje file cache size - * @ingroup Caches - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_edje_file_cache_all_set(int size); - -/** - * Get the configured edje collections (groups) cache size. - * - * This gets the globally configured edje collections cache size, in - * number of collections. - * - * @return The edje collections cache size - * @ingroup Caches - */ -EAPI int elm_edje_collection_cache_get(void); - -/** - * Set the configured edje collections (groups) cache size - * - * This sets the globally configured edje collections cache size, in - * number of collections. - * - * @param size The edje collections cache size - * @ingroup Caches - */ -EAPI void elm_edje_collection_cache_set(int size); - -/** - * Set the configured edje collections (groups) cache size for all - * applications on the display - * - * This sets the globally configured edje collections cache size -- in - * number of collections -- for all applications on the display. - * - * @param size The edje collections cache size - * @ingroup Caches - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_edje_collection_cache_all_set(int size); -======= EAPI void elm_cache_all_flush(void); ->>>>>>> remotes/origin/upstream /** * @} diff --git a/src/lib/elm_debug.h b/src/lib/elm_debug.h index 811d951..c81c666 100644 --- a/src/lib/elm_debug.h +++ b/src/lib/elm_debug.h @@ -1,10 +1,6 @@ /** * @defgroup Debug Debug -<<<<<<< HEAD - * don't use it unless you are sure -======= * Don't use it unless you are sure. ->>>>>>> remotes/origin/upstream * * @{ */ diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h index 18e67f9..74bf55e 100644 --- a/src/lib/elm_deprecated.h +++ b/src/lib/elm_deprecated.h @@ -1,46 +1,4 @@ -<<<<<<< HEAD -EINA_DEPRECATED EAPI void elm_gen_clear(Evas_Object *obj); -EINA_DEPRECATED EAPI void elm_gen_item_selected_set(Elm_Gen_Item *it, Eina_Bool selected); -EINA_DEPRECATED EAPI Eina_Bool elm_gen_item_selected_get(const Elm_Gen_Item *it); -EINA_DEPRECATED EAPI void elm_gen_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); -EINA_DEPRECATED EAPI Eina_Bool elm_gen_always_select_mode_get(const Evas_Object *obj); -EINA_DEPRECATED EAPI void elm_gen_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select); -EINA_DEPRECATED EAPI Eina_Bool elm_gen_no_select_mode_get(const Evas_Object *obj); -EINA_DEPRECATED EAPI void elm_gen_bounce_set(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); -EINA_DEPRECATED EAPI void elm_gen_page_relative_set(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); - -EINA_DEPRECATED EAPI void elm_gen_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize); -EINA_DEPRECATED EAPI void elm_gen_current_page_get(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); -EINA_DEPRECATED EAPI void elm_gen_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber); -EINA_DEPRECATED EAPI void elm_gen_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber); -EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_first_item_get(const Evas_Object *obj); -EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_last_item_get(const Evas_Object *obj); -EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_item_next_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); - -/** - * Get the widget object's handle which contains a given item - * - * @param it The Elementary object item - * @return The widget object - * - * @note This returns the widget object itself that an item belongs to. - * @note Every elm_object_item supports this API - * @deprecated Use elm_object_item_widget_get() instead - * @ingroup General - */ -EINA_DEPRECATED EAPI Evas_Object *elm_object_item_object_get(const Elm_Object_Item *it); - -/** - * @defgroup Toggle Toggle - * -======= /** ->>>>>>> remotes/origin/upstream * @image html img/widget/toggle/preview-00.png * @image latex img/widget/toggle/preview-00.eps * @@ -62,11 +20,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_object_item_object_get(con * until the toggle is released by the cursor (assuming it * has been triggered by the cursor in the first place). * -<<<<<<< HEAD - * Default contents parts of the toggle widget that you can use for are: -======= * Default content parts of the toggle widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "icon" - An icon of the toggle * * Default text parts of the toggle widget that you can use for are: @@ -127,11 +81,6 @@ EINA_DEPRECATED EAPI void elm_toggle_icon_set(Evas_Object *obj, Evas_Obj * * Return the icon object which is set for this widget. * -<<<<<<< HEAD - * @see elm_toggle_icon_set() - * -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_part_content_get() instead. */ EINA_DEPRECATED EAPI Evas_Object *elm_toggle_icon_get(const Evas_Object *obj); @@ -144,11 +93,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_toggle_icon_get(const Evas_Object *obj); * * Unparent and return the icon object which was set for this widget. * -<<<<<<< HEAD - * @see elm_toggle_icon_set() - * -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_part_content_unset() instead. */ EINA_DEPRECATED EAPI Evas_Object *elm_toggle_icon_unset(Evas_Object *obj); @@ -276,332 +220,6 @@ EINA_DEPRECATED EAPI void elm_scrolled_entry_cnp_textonly_set(Evas_Objec EINA_DEPRECATED EAPI Eina_Bool elm_scrolled_entry_cnp_textonly_get(Evas_Object *obj); /** -<<<<<<< HEAD - * Set the text to show in the anchorblock - * - * Sets the text of the anchorblock to @p text. This text can include markup - * format tags, including \ to begin a segment - * of text that will be specially styled and react to click events, ended - * with either of \ or \. When clicked, the anchor will emit an - * "anchor,clicked" signal that you can attach a callback to with - * evas_object_smart_callback_add(). The name of the anchor given in the - * event info struct will be the one set in the href attribute, in this - * case, anchorname. - * - * Other markup can be used to style the text in different ways, but it's - * up to the style defined in the theme which tags do what. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text); - -/** - * Get the markup text set for the anchorblock - * - * Retrieves the text set on the anchorblock, with markup tags included. - * - * @param obj The anchorblock object - * @return The markup text set or @c NULL if nothing was set or an error - * occurred - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_anchorblock_text_get(const Evas_Object *obj); - -/** - * Set the text to show in the anchorview - * - * Sets the text of the anchorview to @p text. This text can include markup - * format tags, including \ to begin a segment of - * text that will be specially styled and react to click events, ended with - * either of \ or \. When clicked, the anchor will emit an - * "anchor,clicked" signal that you can attach a callback to with - * evas_object_smart_callback_add(). The name of the anchor given in the - * event info struct will be the one set in the href attribute, in this - * case, anchorname. - * - * Other markup can be used to style the text in different ways, but it's - * up to the style defined in the theme which tags do what. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text); - -/** - * Get the markup text set for the anchorview - * - * Retrieves the text set on the anchorview, with markup tags included. - * - * @param obj The anchorview object - * @return The markup text set or @c NULL if nothing was set or an error - * occurred - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_anchorview_text_get(const Evas_Object *obj); - -/** - * @brief Get the ctxpopup item's disabled/enabled state. - * - * @param it Ctxpopup item to be enabled/disabled - * @return disabled @c EINA_TRUE, if disabled, @c EINA_FALSE otherwise - * - * @see elm_ctxpopup_item_disabled_set() - * @deprecated use elm_object_item_disabled_get() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI Eina_Bool elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it); - -/** - * @brief Set the ctxpopup item's state as disabled or enabled. - * - * @param it Ctxpopup item to be enabled/disabled - * @param disabled @c EINA_TRUE to disable it, @c EINA_FALSE to enable it - * - * When disabled the item is greyed out to indicate it's state. - * @deprecated use elm_object_item_disabled_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled); - -/** - * @brief Get the icon object for the given ctxpopup item. - * - * @param it Ctxpopup item - * @return icon object or @c NULL, if the item does not have icon or an error - * occurred - * - * @see elm_ctxpopup_item_append() - * @see elm_ctxpopup_item_icon_set() - * - * @deprecated use elm_object_item_part_content_get() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_Item *it); - -/** - * @brief Sets the side icon associated with the ctxpopup item - * - * @param it Ctxpopup item - * @param icon Icon object to be set - * - * Once the icon object is set, a previously set one will be deleted. - * @warning Setting the same icon for two items will cause the icon to - * dissapear from the first item. - * - * @see elm_ctxpopup_item_append() - * - * @deprecated use elm_object_item_part_content_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon); - -/** - * @brief Get the label for the given ctxpopup item. - * - * @param it Ctxpopup item - * @return label string or @c NULL, if the item does not have label or an - * error occured - * - * @see elm_ctxpopup_item_append() - * @see elm_ctxpopup_item_label_set() - * - * @deprecated use elm_object_item_text_get() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI const char *elm_ctxpopup_item_label_get(const Elm_Object_Item *it); - -/** - * @brief (Re)set the label on the given ctxpopup item. - * - * @param it Ctxpopup item - * @param label String to set as label - * - * @deprecated use elm_object_item_text_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label); - -/** - * @brief Set an elm widget as the content of the ctxpopup. - * - * @param obj Ctxpopup object - * @param content Content to be swallowed - * - * If the content object is already set, a previous one will bedeleted. If - * you want to keep that old content object, use the - * elm_ctxpopup_content_unset() function. - * - * @warning Ctxpopup can't hold both a item list and a content at the same - * time. When a content is set, any previous items will be removed. - * - * @deprecated use elm_object_content_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_content_set(Evas_Object *obj, Evas_Object *content); - -/** - * @brief Unset the ctxpopup content - * - * @param obj Ctxpopup object - * @return The content that was being used - * - * Unparent and return the content object which was set for this widget. - * - * @deprecated use elm_object_content_unset() - * - * @see elm_ctxpopup_content_set() - * - * @deprecated use elm_object_content_unset() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_content_unset(Evas_Object *obj); - -/** - * @brief Delete the given item in a ctxpopup object. - * - * @param it Ctxpopup item to be deleted - * - * @deprecated Use elm_object_item_del() instead - * @see elm_ctxpopup_item_append() - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_item_del(Elm_Object_Item *it); - -/** - * Set the label for a given file selector button widget - * - * @param obj The file selector button widget - * @param label The text label to be displayed on @p obj - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label); - -/** - * Get the label set for a given file selector button widget - * - * @param obj The file selector button widget - * @return The button label - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj); - -/** - * Set the icon on a given file selector button widget - * - * @param obj The file selector button widget - * @param icon The icon object for the button - * - * Once the icon object is set, a previously set one will be - * deleted. If you want to keep the latter, use the - * elm_fileselector_button_icon_unset() function. - * - * @deprecated Use elm_object_part_content_set() instead - * @see elm_fileselector_button_icon_get() - */ -EINA_DEPRECATED EAPI void elm_fileselector_button_icon_set(Evas_Object *obj, Evas_Object *icon); - -/** - * Get the icon set for a given file selector button widget - * - * @param obj The file selector button widget - * @return The icon object currently set on @p obj or @c NULL, if - * none is - * - * @deprecated Use elm_object_part_content_get() instead - * @see elm_fileselector_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_button_icon_get(const Evas_Object *obj); - -/** - * Unset the icon used in a given file selector button widget - * - * @param obj The file selector button widget - * @return The icon object that was being used on @p obj or @c - * NULL, on errors - * - * Unparent and return the icon object which was set for this - * widget. - * - * @deprecated Use elm_object_part_content_unset() instead - * @see elm_fileselector_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_button_icon_unset(Evas_Object *obj); - -/** - * Set the label for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @param label The text label to be displayed on @p obj widget's - * button - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label); - -/** - * Get the label set for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @return The widget button's label - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_fileselector_entry_button_label_get(const Evas_Object *obj); - -/** - * Set the icon on a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @param icon The icon object for the entry's button - * - * Once the icon object is set, a previously set one will be - * deleted. If you want to keep the latter, use the - * elm_fileselector_entry_button_icon_unset() function. - * - * @deprecated Use elm_object_part_content_set() instead - * @see elm_fileselector_entry_button_icon_get() - */ -EINA_DEPRECATED EAPI void elm_fileselector_entry_button_icon_set(Evas_Object *obj, Evas_Object *icon); - -/** - * Get the icon set for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @return The icon object currently set on @p obj widget's button - * or @c NULL, if none is - * - * @deprecated Use elm_object_part_content_get() instead - * @see elm_fileselector_entry_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_entry_button_icon_get(const Evas_Object *obj); - -/** - * Unset the icon used in a given file selector entry widget's - * button - * - * @param obj The file selector entry widget - * @return The icon object that was being used on @p obj widget's - * button or @c NULL, on errors - * - * Unparent and return the icon object which was set for this - * widget's button. - * - * @deprecated Use elm_object_part_content_unset() instead - * @see elm_fileselector_entry_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_entry_button_icon_unset(Evas_Object *obj); - -/** -======= ->>>>>>> remotes/origin/upstream * @brief Sets the content of the hover object and the direction in which it * will pop out. * @@ -619,11 +237,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_entry_button_i * * All directions may have contents at the same time, except for * "smart". This is a special placement hint and its use case -<<<<<<< HEAD - * independs of the calculations coming from -======= * depends of the calculations coming from ->>>>>>> remotes/origin/upstream * elm_hover_best_content_location_get(). Its use is for cases when * one desires only one hover content, but with a dynamic special * placement within the hover area. The content's geometry, whenever @@ -789,17 +403,6 @@ EINA_DEPRECATED EAPI void elm_hoversel_item_del_cb_set(E EINA_DEPRECATED EAPI void elm_hoversel_item_del(Elm_Object_Item *it); /** -<<<<<<< HEAD - * Set actionslider label. - * - * @param[in] obj The actionslider object - * @param[in] pos The position of the label. - * (ELM_ACTIONSLIDER_LABEL_LEFT, ELM_ACTIONSLIDER_LABEL_RIGHT) - * @param label The label which is going to be set. - * @deprecated use elm_object_part_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_actionslider_label_set(Evas_Object *obj, Elm_Actionslider_Label_Pos pos, const char *label); -======= * Set actionslider labels. * * @param obj The actionslider object @@ -809,7 +412,6 @@ EINA_DEPRECATED EAPI void elm_actionslider_label_set(Evas_Object *obj, El * @deprecated use elm_object_text_set() instead. */ EINA_DEPRECATED EAPI void elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label); ->>>>>>> remotes/origin/upstream /** * Get actionslider labels. @@ -853,10 +455,6 @@ EINA_DEPRECATED EAPI const char *elm_actionslider_indicator_label_get(Evas_Objec * * @deprecated use elm_object_part_content_set() instead * -<<<<<<< HEAD - * @ingroup Bg -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_bg_overlay_set(Evas_Object *obj, Evas_Object *overlay); @@ -871,10 +469,6 @@ EINA_DEPRECATED EAPI void elm_bg_overlay_set(Evas_Object *obj, Evas_Obje * * @deprecated use elm_object_part_content_get() instead * -<<<<<<< HEAD - * @ingroup Bg -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_get(const Evas_Object *obj); @@ -888,10 +482,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_get(const Evas_Object *obj); * * @deprecated use elm_object_part_content_unset() instead * -<<<<<<< HEAD - * @ingroup Bg -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_unset(Evas_Object *obj); @@ -1112,10 +702,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_unset(Evas_Object *obj); * * @see elm_calendar_mark_add() * -<<<<<<< HEAD - * @ingroup Calendar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos); @@ -1135,10 +721,6 @@ EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, * * @see elm_calendar_mark_add() * -<<<<<<< HEAD - * @ingroup Calendar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, int pos); @@ -1167,10 +749,6 @@ EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, i * * @see elm_calendar_mark_add() * -<<<<<<< HEAD - * @ingroup Calendar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos); @@ -1317,10 +895,6 @@ EINA_DEPRECATED EAPI void elm_check_states_labels_get(const Evas_Object * * @deprecated use elm_object_content_set() instead * -<<<<<<< HEAD - * @ingroup Conformant -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content); @@ -1339,10 +913,6 @@ EINA_DEPRECATED EAPI void elm_conformant_content_set(Evas_Object *obj, E * * @deprecated use elm_object_content_get() instead * -<<<<<<< HEAD - * @ingroup Conformant -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *obj); @@ -1358,49 +928,29 @@ EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_get(const Evas_Object * * * @deprecated use elm_object_content_unset() instead * -<<<<<<< HEAD - * @ingroup Conformant -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj); /** * Get the side labels max length. * -<<<<<<< HEAD - * @deprecated use elm_diskselector_side_label_length_get() instead: -======= * @deprecated use elm_diskselector_side_text_max_length_get() instead: ->>>>>>> remotes/origin/upstream * * @param obj The diskselector object. * @return The max length defined for side labels, or 0 if not a valid * diskselector. * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI int elm_diskselector_side_label_lenght_get(const Evas_Object *obj); /** * Set the side labels max length. * -<<<<<<< HEAD - * @deprecated use elm_diskselector_side_label_length_set() instead: -======= * @deprecated use elm_diskselector_side_text_max_length_set() instead: ->>>>>>> remotes/origin/upstream * * @param obj The diskselector object. * @param len The max length defined for side labels. * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_side_label_lenght_set(Evas_Object *obj, int len); @@ -1417,10 +967,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_side_label_lenght_set(Evas_Object * * @see elm_diskselector_item_append() * @deprecated Use elm_object_item_data_get() * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void *elm_diskselector_item_data_get(const Elm_Object_Item *it); @@ -1436,11 +982,7 @@ EINA_DEPRECATED EAPI void *elm_diskselector_item_data_get(const * * Once the icon object is set, a previously set one will be deleted. * @warning Setting the same icon for two items will cause the icon to -<<<<<<< HEAD - * dissapear from the first item. -======= * disappear from the first item. ->>>>>>> remotes/origin/upstream * * If an icon was passed as argument on item creation, with function * elm_diskselector_item_append(), it will be already @@ -1450,21 +992,13 @@ EINA_DEPRECATED EAPI void *elm_diskselector_item_data_get(const * @see elm_diskselector_item_icon_get() * * @deprecated Use elm_object_item_part_content_set() instead -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_icon_set(Elm_Object_Item *it, Evas_Object *icon); /** * Get the icon associated to the item. * -<<<<<<< HEAD - * @param item The diskselector item -======= * @param it The diskselector item ->>>>>>> remotes/origin/upstream * @return The icon associated to @p it * * The return value is a pointer to the icon associated to @p item when it was @@ -1476,10 +1010,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_icon_set(Elm_O * @see elm_diskselector_item_icon_set() * * @deprecated Use elm_object_item_part_content_set() instead -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EAPI Evas_Object *elm_diskselector_item_icon_get(const Elm_Object_Item *it); @@ -1497,11 +1027,7 @@ EAPI Evas_Object *elm_diskselector_item_icon_get(const Elm_Object_Item * * An item with label "January" would be displayed on side position as * "Jan" if max length is set to 3 with function -<<<<<<< HEAD - * elm_diskselector_side_label_lenght_set(), or "Janu", if this property -======= * elm_diskselector_side_text_max_length_set(), or "Janu", if this property ->>>>>>> remotes/origin/upstream * is set to 4. * * When this @p item is selected, the entire label will be displayed, @@ -1514,19 +1040,11 @@ EAPI Evas_Object *elm_diskselector_item_icon_get(const Elm_Object_Item * elm_diskselector_item_append(), it will be already * displayed by the item. * -<<<<<<< HEAD - * @see elm_diskselector_side_label_lenght_set() -======= * @see elm_diskselector_side_text_max_length_set() ->>>>>>> remotes/origin/upstream * @see elm_diskselector_item_label_get() * @see elm_diskselector_item_append() * * @deprecated Use elm_object_item_text_set() instead -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_label_set(Elm_Object_Item *it, const char *label); @@ -1543,14 +1061,8 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_label_set(Elm_ * * @see elm_diskselector_item_label_set() for more details. * @see elm_diskselector_item_append() -<<<<<<< HEAD - * @use elm_object_item_text_get() - * - * @ingroup Diskselector -======= * @deprecated Use elm_object_item_text_get() instead * ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_diskselector_item_label_get(const Elm_Object_Item *it); @@ -1570,10 +1082,6 @@ EINA_DEPRECATED EAPI const char *elm_diskselector_item_label_get(cons * freed. * @deprecated Use elm_object_item_del_cb_set() instead * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func); @@ -1589,10 +1097,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_del_cb_set(Elm * @see elm_diskselector_clear() * @see elm_diskselector_item_append() * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_del(Elm_Object_Item *it); @@ -1608,10 +1112,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_del(Elm_Object * @deprecated Use elm_object_item_tooltip_text_set() instead * @see elm_object_tooltip_text_set() for more details. * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_text_set(Elm_Object_Item *it, const char *text); @@ -1636,10 +1136,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_text_s * @deprecated Use elm_object_item_tooltip_content_cb_set() instead * @see elm_object_tooltip_content_cb_set() for more details. * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); @@ -1656,10 +1152,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_conten * @see elm_object_tooltip_unset() for more details. * @see elm_diskselector_item_tooltip_content_cb_set() * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_unset(Elm_Object_Item *it); @@ -1676,10 +1168,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_unset( * @deprecated Use elm_object_item_tooltip_style_set() instead * @see elm_object_tooltip_style_set() for more details. * -<<<<<<< HEAD - * @ingroup Diskselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_style_set(Elm_Object_Item *it, const char *style); @@ -1694,12 +1182,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_style_ * @see elm_object_tooltip_style_get() for more details. * @see elm_diskselector_item_tooltip_style_set() * -<<<<<<< HEAD - * @ingroup Diskselector - */ -EINA_DEPRECATED EAPI const char *elm_diskselector_item_tooltip_style_get(const Elm_Object_Item *it); - -======= */ EINA_DEPRECATED EAPI const char *elm_diskselector_item_tooltip_style_get(const Elm_Object_Item *it); @@ -1804,7 +1286,6 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_engine_ */ EINA_DEPRECATED EAPI Eina_Bool elm_diskselector_item_cursor_engine_only_get(const Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream EINA_DEPRECATED EAPI void elm_factory_content_set(Evas_Object *obj, Evas_Object *content); EINA_DEPRECATED EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj); @@ -1817,10 +1298,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj * @see elm_object_item_text_set() * * @deprecated see elm_object_item_text_get() instead -<<<<<<< HEAD - * @ingroup Flipselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_flipselector_item_label_get(const Elm_Object_Item *it); @@ -1833,10 +1310,6 @@ EINA_DEPRECATED EAPI const char *elm_flipselector_item_label_get(const Elm_Objec * @see elm_object_item_text_get() * * @deprecated see elm_object_item_text_set() instead -<<<<<<< HEAD - * @ingroup Flipselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_flipselector_item_label_set(Elm_Object_Item *it, const char *label); @@ -1846,16 +1319,10 @@ EINA_DEPRECATED EAPI void elm_flipselector_item_label_set(Elm_Object_Item * @param it The item to delete * * @deprecated Use elm_object_item_del() instead -<<<<<<< HEAD - * @ingroup Flipselector -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_flipselector_item_del(Elm_Object_Item *it); /** -<<<<<<< HEAD -======= * Set the interval on time updates for a user mouse button hold * on a flip selector widget. * @@ -1897,7 +1364,6 @@ EINA_DEPRECATED EAPI void elm_flipselector_interval_set(E EINA_DEPRECATED EAPI double elm_flipselector_interval_get(const Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * Make a given Elementary object the focused one. * * @param obj The Elementary object to make focused. @@ -1909,16 +1375,10 @@ EINA_DEPRECATED EAPI double elm_flipselector_interval_get(c * @see elm_object_focus_get() * @deprecated use elm_object_focus_set() instead. * -<<<<<<< HEAD - * @ingroup Focus -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_object_focus(Evas_Object *obj); /** -<<<<<<< HEAD -======= * Give focus to next object in object tree. * * Give focus to next object in focus chain of one object sub-tree. @@ -1933,7 +1393,6 @@ EINA_DEPRECATED EAPI void elm_object_focus(Evas_Object *obj); EINA_DEPRECATED EAPI void elm_object_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir); /** ->>>>>>> remotes/origin/upstream * Remove the focus from an Elementary object * * @param obj The Elementary to take focus from @@ -1944,22 +1403,10 @@ EINA_DEPRECATED EAPI void elm_object_focus_cycle(Evas_Object *ob * @see elm_object_focus() and elm_object_focus_custom_chain_get() * @deprecated use elm_object_focus_set() instead. * -<<<<<<< HEAD - * @ingroup Focus -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_object_unfocus(Evas_Object *obj); /** -<<<<<<< HEAD - * @brief Set the frame label - * - * @param obj The frame object - * @param label The label of this frame object - * - * @deprecated use elm_object_text_set() instead. -======= * Give focus to near object in one direction. * * Give focus to near object in direction of one object. @@ -1980,7 +1427,6 @@ EINA_DEPRECATED EAPI void elm_object_focus_direction_go(Evas_Obj * @param label The label of this frame object * * @deprecated use elm_object_text_set() instead. ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_frame_label_set(Evas_Object *obj, const char *label); @@ -1989,11 +1435,7 @@ EINA_DEPRECATED EAPI void elm_frame_label_set(Evas_Object *obj, const ch * * @param obj The frame object * -<<<<<<< HEAD - * @return The label of this frame objet or NULL if unable to get frame -======= * @return The label of this frame object or NULL if unable to get frame ->>>>>>> remotes/origin/upstream * * @deprecated use elm_object_text_get() instead. */ @@ -2057,10 +1499,6 @@ EINA_DEPRECATED EAPI void elm_genlist_item_icons_orphan(Elm_Object_Item * @see elm_genlist_horizontal_get() * * @deprecated use elm_genlist_mode_set() -<<<<<<< HEAD - * @ingroup Genlist -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_genlist_horizontal_set(Evas_Object *obj, Elm_List_Mode mode); @@ -2074,14 +1512,8 @@ EINA_DEPRECATED EAPI void elm_genlist_horizontal_set(Ev * @see elm_genlist_horizontal_set() * * @deprecated use elm_genlist_mode_get() -<<<<<<< HEAD - * @ingroup Genlist - */ -EAPI Elm_List_Mode elm_genlist_horizontal_get(const Evas_Object *obj); -======= */ EINA_DEPRECATED EAPI Elm_List_Mode elm_genlist_horizontal_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * Return the data associated to a given genlist item @@ -2096,10 +1528,6 @@ EINA_DEPRECATED EAPI Elm_List_Mode elm_genlist_horizontal_get(co * @see elm_genlist_item_data_set() * * @deprecated Use elm_object_item_data_get() instead -<<<<<<< HEAD - * @ingroup Genlist -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void *elm_genlist_item_data_get(const Elm_Object_Item *it); @@ -2118,10 +1546,6 @@ EINA_DEPRECATED EAPI void *elm_genlist_item_data_get(con * @see elm_genlist_item_data_get() * * @deprecated Use elm_object_item_data_set() instead -<<<<<<< HEAD - * @ingroup Genlist -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_genlist_item_data_set(Elm_Object_Item *it, const void *data); @@ -2138,10 +1562,6 @@ EINA_DEPRECATED EAPI void elm_genlist_item_data_set(Elm * @see elm_genlist_item_disabled_get() * @deprecated Use elm_object_item_disabled_set() instead * -<<<<<<< HEAD - * @ingroup Genlist -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_genlist_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled); @@ -2155,10 +1575,6 @@ EINA_DEPRECATED EAPI void elm_genlist_item_disabled_set * @see elm_genlist_item_disabled_set() for more details * @deprecated Use elm_object_item_disabled_get() instead * -<<<<<<< HEAD - * @ingroup Genlist -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Eina_Bool elm_genlist_item_disabled_get(const Elm_Object_Item *it); @@ -2172,10 +1588,6 @@ EINA_DEPRECATED EAPI Eina_Bool elm_genlist_item_disabled_get * once. * * @deprecated Use elm_object_item_del() instead -<<<<<<< HEAD - * @ingroup Genlist -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_genlist_item_del(Elm_Object_Item *it); @@ -2189,12 +1601,6 @@ EINA_DEPRECATED EAPI void elm_genlist_item_del(Elm_Obje * This returns the genlist object itself that an item belongs to. * @deprecated Use elm_object_item_widget_get() instead * -<<<<<<< HEAD - * @ingroup Genlist - */ -EINA_DEPRECATED EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Object_Item *it); - -======= */ EINA_DEPRECATED EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Object_Item *it); @@ -2270,7 +1676,6 @@ EINA_DEPRECATED EAPI Elm_Genlist_Item_Type elm_genlist_item_flags_get(con * @deprecated Use elm_genlist_item_all_contents_unset() instead */ EINA_DEPRECATED EAPI void elm_genlist_item_contents_orphan(Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream #define ELM_IMAGE_ROTATE_90_CW 1 #define ELM_IMAGE_ROTATE_180_CW 2 @@ -2279,20 +1684,12 @@ EINA_DEPRECATED EAPI void elm_genlist_item_contents_orp /** * Return the data associated with a given index widget item * -<<<<<<< HEAD - * @param it The index widget item handle -======= * @param item The index widget item handle ->>>>>>> remotes/origin/upstream * @return The data associated with @p it * @deprecated Use elm_object_item_data_get() instead * * @see elm_index_item_data_set() * -<<<<<<< HEAD - * @ingroup Index -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void *elm_index_item_data_get(const Elm_Object_Item *item); @@ -2308,10 +1705,6 @@ EINA_DEPRECATED EAPI void *elm_index_item_data_get(const Elm_Object_Item *item); * the user had better to free that old data himself/herself. * * @deprecated Use elm_object_item_data_set() instead -<<<<<<< HEAD - * @ingroup Index -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_index_item_data_set(Elm_Object_Item *it, const void *data); @@ -2326,10 +1719,6 @@ EINA_DEPRECATED EAPI void elm_index_item_data_set(Elm_Object_Item *it, const vo * @c obj argument with a handle to the parent index widget. * * @deprecated Use elm_object_item_del_cb_set() instead -<<<<<<< HEAD - * @ingroup Index -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_index_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func); @@ -2344,10 +1733,6 @@ EINA_DEPRECATED EAPI void elm_index_item_del_cb_set(Elm_Object_ * that callback function will be called by this one. * * @deprecated Use elm_object_item_del() instead -<<<<<<< HEAD - * @ingroup Index -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_index_item_del(Evas_Object *obj, Elm_Object_Item *item); @@ -2376,10 +1761,7 @@ EINA_DEPRECATED EAPI const char *elm_label_label_get(const Evas_Object *obj); * @param obj The layout object * @param swallow The swallow part name in the edje file * @param content The child that will be added in this layout object -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * Once the content object is set, a previously set one will be deleted. * If you want to keep that old content object, use the @@ -2396,14 +1778,8 @@ EINA_DEPRECATED EAPI const char *elm_label_label_get(const Evas_Object *obj); * @see @ref secBox * @deprecated use elm_object_part_content_set() instead * -<<<<<<< HEAD - * @ingroup Layout - */ -EINA_DEPRECATED EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content); -======= */ EINA_DEPRECATED EAPI Eina_Bool elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content); ->>>>>>> remotes/origin/upstream /** * Get the child object in the given content part. @@ -2415,10 +1791,6 @@ EINA_DEPRECATED EAPI Eina_Bool elm_layout_content_set(Evas_Object *obj, const * * @deprecated use elm_object_part_content_get() instead * -<<<<<<< HEAD - * @ingroup Layout -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow); @@ -2433,10 +1805,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, * * @deprecated use elm_object_part_content_unset() instead * -<<<<<<< HEAD - * @ingroup Layout -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow); @@ -2446,19 +1814,11 @@ EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, con * @param obj The layout object * @param part The TEXT part where to set the text * @param text The text to set -<<<<<<< HEAD - * - * @ingroup Layout - * @deprecated use elm_object_part_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_layout_text_set(Evas_Object *obj, const char *part, const char *text); -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise * * @deprecated use elm_object_part_text_set() instead. */ EINA_DEPRECATED EAPI Eina_Bool elm_layout_text_set(Evas_Object *obj, const char *part, const char *text); ->>>>>>> remotes/origin/upstream /** * Get the text set in the given part @@ -2468,26 +1828,15 @@ EINA_DEPRECATED EAPI Eina_Bool elm_layout_text_set(Evas_Object *obj, const ch * * @return The text set in @p part * -<<<<<<< HEAD - * @ingroup Layout -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_part_text_get() instead. */ EINA_DEPRECATED EAPI const char *elm_layout_text_get(const Evas_Object *obj, const char *part); /** * @def elm_layout_label_set -<<<<<<< HEAD - * Convienience macro to set the label in a layout that follows the - * Elementary naming convention for its parts. - * - * @ingroup Layout -======= * Convenience macro to set the label in a layout that follows the * Elementary naming convention for its parts. * ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_text_set() instead. */ #define elm_layout_label_set(_ly, _txt) \ @@ -2498,10 +1847,6 @@ EINA_DEPRECATED EAPI const char *elm_layout_text_get(const Evas_Object *obj, co * Convenience macro to get the label in a layout that follows the * Elementary naming convention for its parts. * -<<<<<<< HEAD - * @ingroup Layout -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_text_set() instead. */ #define elm_layout_label_get(_ly) \ @@ -2524,10 +1869,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_list_item_base_get(const Elm_Object_Item * * * @deprecated use elm_object_content_set() instead * -<<<<<<< HEAD - * @ingroup Mapbuf -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content); @@ -2543,10 +1884,6 @@ EINA_DEPRECATED EAPI void elm_mapbuf_content_set(Evas_Object *obj, Evas_ * * @deprecated use elm_object_content_get() instead * -<<<<<<< HEAD - * @ingroup Mapbuf -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_get(const Evas_Object *obj); @@ -2562,10 +1899,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_get(const Evas_Object *obj) * * @deprecated use elm_object_content_unset() instead * -<<<<<<< HEAD - * @ingroup Mapbuf -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_unset(Evas_Object *obj); @@ -2575,11 +1908,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_unset(Evas_Object *obj); * @param it The menu item object. * @param label The label to set for @p item * -<<<<<<< HEAD - * @warning Don't use this funcion on items created with -======= * @warning Don't use this function on items created with ->>>>>>> remotes/origin/upstream * elm_menu_item_add_object() or elm_menu_item_separator_add(). * * @deprecated Use elm_object_item_text_set() instead @@ -2689,8 +2018,6 @@ EINA_DEPRECATED EAPI void elm_menu_item_data_set(Elm_Object_Item *it, co EINA_DEPRECATED EAPI void elm_menu_item_del(Elm_Object_Item *it); /** -<<<<<<< HEAD -======= * @brief @brief Return a menu item's owner menu * * @param it The menu item @@ -2724,7 +2051,6 @@ EINA_DEPRECATED EAPI void elm_menu_item_object_icon_name EINA_DEPRECATED EAPI const char *elm_menu_item_object_icon_name_get(const Elm_Object_Item *it); /** ->>>>>>> remotes/origin/upstream * @brief Set the content of the notify widget * * @param obj The notify object @@ -2774,10 +2100,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_notify_content_get(const Evas_Object *obj) * * @note Elementary objects may have many labels (e.g. Action Slider) * @deprecated Use elm_object_part_text_set() instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_object_text_part_set(Evas_Object *obj, const char *part, const char *label); @@ -2790,10 +2112,6 @@ EINA_DEPRECATED EAPI void elm_object_text_part_set(Evas_Object *obj, con * * @note Elementary objects may have many labels (e.g. Action Slider) * @deprecated Use elm_object_part_text_get() instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_object_text_part_get(const Evas_Object *obj, const char *part); @@ -2806,10 +2124,6 @@ EINA_DEPRECATED EAPI const char *elm_object_text_part_get(const Evas_Object *ob * * @note Elementary objects may have many contents * @deprecated Use elm_object_part_content_set instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); @@ -2822,10 +2136,6 @@ EINA_DEPRECATED EAPI void elm_object_content_part_set(Evas_Object *obj, * * @note Elementary objects may have many contents * @deprecated Use elm_object_part_content_get instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part); @@ -2837,10 +2147,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_get(const Evas_Object * * @note Elementary objects may have many contents * @deprecated Use elm_object_part_content_unset instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part); @@ -2853,10 +2159,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj * * @note Elementary object items may have many contents * @deprecated Use elm_object_item_part_content_set instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_object_item_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content); @@ -2869,10 +2171,6 @@ EINA_DEPRECATED EAPI void elm_object_item_content_part_set(Elm_Object_It * * @note Elementary object items may have many contents * @deprecated Use elm_object_item_part_content_get instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part); @@ -2884,10 +2182,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_g * * @note Elementary object items may have many contents * @deprecated Use elm_object_item_part_content_unset instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part); @@ -2900,10 +2194,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_unset(Elm_Object_ * * @note Elementary object items may have many labels * @deprecated Use elm_object_item_part_text_get instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part); @@ -2916,10 +2206,6 @@ EINA_DEPRECATED EAPI const char *elm_object_item_text_part_get(const Elm_Object * * @note Elementary object items may have many labels * @deprecated Use elm_object_item_part_text_set instead. -<<<<<<< HEAD - * @ingroup General -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_object_item_text_part_set(Elm_Object_Item *it, const char *part, const char *label); @@ -2986,10 +2272,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_panel_content_unset(Evas_Object *obj); * * @deprecated use elm_object_part_content_set() instead * -<<<<<<< HEAD - * @ingroup Panes -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content); @@ -3011,10 +2293,6 @@ EINA_DEPRECATED EAPI void elm_panes_content_left_set(Evas_Object *obj, E * * @deprecated use elm_object_part_content_set() instead * -<<<<<<< HEAD - * @ingroup Panes -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content); @@ -3030,10 +2308,6 @@ EINA_DEPRECATED EAPI void elm_panes_content_right_set(Evas_Object *obj, * * @deprecated use elm_object_part_content_get() instead * -<<<<<<< HEAD - * @ingroup Panes -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_get(const Evas_Object *obj); @@ -3049,10 +2323,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_get(const Evas_Object * * * @deprecated use elm_object_part_content_get() instead * -<<<<<<< HEAD - * @ingroup Panes -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_get(const Evas_Object *obj); @@ -3069,10 +2339,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_get(const Evas_Object * * @deprecated use elm_object_part_content_unset() instead * -<<<<<<< HEAD - * @ingroup Panes -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_unset(Evas_Object *obj); @@ -3090,10 +2356,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_unset(Evas_Object *obj) * * @deprecated use elm_object_part_content_unset() instead * -<<<<<<< HEAD - * @ingroup Panes -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_unset(Evas_Object *obj); /** @@ -3102,10 +2364,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_unset(Evas_Object *obj * @param obj The progress bar object * @param label The text label string, in UTF-8 * -<<<<<<< HEAD - * @ingroup Progressbar -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_text_set() instead. */ EINA_DEPRECATED EAPI void elm_progressbar_label_set(Evas_Object *obj, const char *label); @@ -3116,10 +2374,6 @@ EINA_DEPRECATED EAPI void elm_progressbar_label_set(Evas_Object *obj, co * @param obj The progressbar object * @return The text label string, in UTF-8 * -<<<<<<< HEAD - * @ingroup Progressbar -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_text_set() instead. */ EINA_DEPRECATED EAPI const char *elm_progressbar_label_get(const Evas_Object *obj); @@ -3139,10 +2393,6 @@ EINA_DEPRECATED EAPI const char *elm_progressbar_label_get(const Evas_Object *o * @see elm_progressbar_icon_get() * @deprecated use elm_object_part_content_set() instead. * -<<<<<<< HEAD - * @ingroup Progressbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_progressbar_icon_set(Evas_Object *obj, Evas_Object *icon); @@ -3156,10 +2406,6 @@ EINA_DEPRECATED EAPI void elm_progressbar_icon_set(Evas_Object *obj, Eva * @see elm_progressbar_icon_set() for more details * @deprecated use elm_object_part_content_get() instead. * -<<<<<<< HEAD - * @ingroup Progressbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_progressbar_icon_get(const Evas_Object *obj); @@ -3176,10 +2422,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_progressbar_icon_get(const Evas_Object *ob * @see elm_progressbar_icon_set() for more details * @deprecated use elm_object_part_content_unset() instead. * -<<<<<<< HEAD - * @ingroup Progressbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_progressbar_icon_unset(Evas_Object *obj); @@ -3290,10 +2532,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_scroller_content_unset(Evas_Object *obj); * @param obj The progress bar object * @param label The text label string, in UTF-8 * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_text_set() instead. */ EINA_DEPRECATED EAPI void elm_slider_label_set(Evas_Object *obj, const char *label); @@ -3304,10 +2542,6 @@ EINA_DEPRECATED EAPI void elm_slider_label_set(Evas_Object *obj, const c * @param obj The progressbar object * @return The text label string, in UTF-8 * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_text_get() instead. */ EINA_DEPRECATED EAPI const char *elm_slider_label_get(const Evas_Object *obj); @@ -3328,10 +2562,6 @@ EINA_DEPRECATED EAPI const char *elm_slider_label_get(const Evas_Object *obj); * @warning If the object being set does not have minimum size hints set, * it won't get properly displayed. * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_object_part_content_set() instead. */ EINA_DEPRECATED EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon); @@ -3353,10 +2583,6 @@ EINA_DEPRECATED EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Obj * @see elm_slider_icon_get() * @deprecated use elm_object_part_content_unset() instead. * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_unset(Evas_Object *obj); @@ -3375,10 +2601,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_unset(Evas_Object *obj); * * @deprecated use elm_object_part_content_get() instead. * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_get(const Evas_Object *obj); @@ -3400,10 +2622,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_get(const Evas_Object *obj); * * @deprecated use elm_object_part_content_set() instead. * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_slider_end_set(Evas_Object *obj, Evas_Object *end); @@ -3426,10 +2644,6 @@ EINA_DEPRECATED EAPI void elm_slider_end_set(Evas_Object *obj, Evas_Obje * @deprecated use elm_object_part_content_unset() instead * instead. * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_unset(Evas_Object *obj); @@ -3450,10 +2664,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_unset(Evas_Object *obj); * @deprecated use elm_object_part_content_get() instead * instead. * -<<<<<<< HEAD - * @ingroup Slider -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_get(const Evas_Object *obj); @@ -3464,10 +2674,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_get(const Evas_Object *obj); * @return Returns the data associated to this item * * @deprecated use elm_object_item_data_get() instead -<<<<<<< HEAD - * @ingroup Slideshow -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void *elm_slideshow_item_data_get(const Elm_Object_Item *it); @@ -3477,16 +2683,10 @@ EINA_DEPRECATED EAPI void *elm_slideshow_item_data_get(const Elm_Object_Item *it * @param it The slideshow item * * @deprecated Use elm_object_item_de() instead -<<<<<<< HEAD - * @ingroup Slideshow -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_slideshow_item_del(Elm_Object_Item *it); /** -<<<<<<< HEAD -======= * Display a given slideshow widget's item, programmatically. * * @param it The item to display on @p obj's viewport @@ -3500,7 +2700,6 @@ EINA_DEPRECATED EAPI void elm_slideshow_item_del(Elm_Object_Ite EINA_DEPRECATED EAPI void elm_slideshow_show(Elm_Object_Item *it); /** ->>>>>>> remotes/origin/upstream * Get the toolbar object from an item. * * @param it The item. @@ -3509,10 +2708,6 @@ EINA_DEPRECATED EAPI void elm_slideshow_show(Elm_Object_Item *i * This returns the toolbar object itself that an item belongs to. * * @deprecated use elm_object_item_object_get() instead. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_toolbar_item_toolbar_get(const Elm_Object_Item *it); @@ -3532,10 +2727,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_toolbar_item_toolbar_get(const Elm_Object_ * @see elm_toolbar_item_append() * * @deprecated use elm_object_item_text_get() instead. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_toolbar_item_label_get(const Elm_Object_Item *it); @@ -3543,11 +2734,7 @@ EINA_DEPRECATED EAPI const char *elm_toolbar_item_label_get(const Elm_Object_It * Set the label of item. * * @param it The item of toolbar. -<<<<<<< HEAD - * @param text The label of item. -======= * @param label The label of item. ->>>>>>> remotes/origin/upstream * * The label to be displayed by the item. * Label will be placed at icons bottom (if set). @@ -3560,10 +2747,6 @@ EINA_DEPRECATED EAPI const char *elm_toolbar_item_label_get(const Elm_Object_It * @see elm_toolbar_item_append() * * @deprecated use elm_object_item_text_set() instead -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_label_set(Elm_Object_Item *it, const char *label); @@ -3576,10 +2759,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_label_set(Elm_Object_Item *it * @see elm_toolbar_item_data_set() * * @deprecated use elm_object_item_data_get() instead. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void *elm_toolbar_item_data_get(const Elm_Object_Item *it); @@ -3595,10 +2774,6 @@ EINA_DEPRECATED EAPI void *elm_toolbar_item_data_get(const Elm_Object_Ite * the user had better to free that old data himself/herself. * * @deprecated use elm_object_item_data_set() instead. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_data_set(Elm_Object_Item *it, const void *data); @@ -3611,10 +2786,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_data_set(Elm_Object_Item *it, * @see elm_toolbar_item_disabled_set() for more details. * * @deprecated use elm_object_item_disabled_get() instead. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_item_disabled_get(const Elm_Object_Item *it); @@ -3630,10 +2801,6 @@ EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_item_disabled_get(const Elm_Object * enabled). * * @deprecated use elm_object_item_disabled_set() instead. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled); @@ -3642,10 +2809,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_disabled_set(Elm_Object_Item * @param obj The toolbar object * @param vertical If @c EINA_TRUE, the toolbar is vertical * By default, a toolbar will be horizontal. Use this function to create a vertical toolbar. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_toolbar_horizontal_set() instead. */ EINA_DEPRECATED EAPI void elm_toolbar_orientation_set(Evas_Object *obj, Eina_Bool vertical); @@ -3655,10 +2818,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_orientation_set(Evas_Object *obj, * @param obj The toolbar object * @return If @c EINA_TRUE, the toolbar is vertical * By default, a toolbar will be horizontal. Use this function to determine whether a toolbar is vertical. -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream * @deprecated use elm_toolbar_horizontal_get() instead. */ EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_orientation_get(const Evas_Object *obj); @@ -3677,12 +2836,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_orientation_get(const Evas_Object * * This way, a data associated to a toolbar item could be properly freed. * -<<<<<<< HEAD - * @deprecated Use elm_object_item_del_cb_set() instead - * @ingroup Toolbar -======= * @deprecated Use elm_object_item_del_cb_set() instead ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func); @@ -3694,10 +2848,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_del_cb_set(El * @deprecated Use elm_object_item_del() instead * @see elm_toolbar_item_append() * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_del(Elm_Object_Item *it); @@ -3714,10 +2864,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_del(Elm_Objec * @deprecated Use elm_object_item_tooltip_text_set() instead * @see elm_object_tooltip_text_set() for more details. * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_text_set(Elm_Object_Item *it, const char *text); @@ -3742,10 +2888,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_text_ * @deprecated Use elm_object_item_tooltip_content_cb_set() instead * @see elm_object_tooltip_content_cb_set() for more details. * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); @@ -3762,10 +2904,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_conte * @see elm_object_tooltip_unset() for more details. * @see elm_toolbar_item_tooltip_content_cb_set() * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_unset(Elm_Object_Item *it); @@ -3782,10 +2920,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_unset * @deprecated Use elm_object_item_tooltip_style_set() instead * @see elm_object_tooltip_style_set() for more details. * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_style_set(Elm_Object_Item *it, const char *style); @@ -3800,10 +2934,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_tooltip_style * @see elm_object_tooltip_style_get() for more details. * @see elm_toolbar_item_tooltip_style_set() * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_toolbar_item_tooltip_style_get(const Elm_Object_Item *it); @@ -3829,10 +2959,6 @@ EINA_DEPRECATED EAPI const char *elm_toolbar_item_tooltip_style * * @deprecated use elm_object_item_cursor_set() instead * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_set(Elm_Object_Item *it, const char *cursor); @@ -3850,10 +2976,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_set(El * * @deprecated Use elm_object_item_cursor_get() instead * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_toolbar_item_cursor_get(const Elm_Object_Item *it); @@ -3872,10 +2994,6 @@ EINA_DEPRECATED EAPI const char *elm_toolbar_item_cursor_get(co * * @deprecated Use elm_object_item_cursor_unset() instead * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_unset(Elm_Object_Item *it); @@ -3891,15 +3009,9 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_unset( * cursor decorations defined in a theme file, which can have, * given a cursor name/type, alternate styles on it. It * works analogously as elm_object_cursor_style_set(), but here -<<<<<<< HEAD - * applyed only to toolbar item objects. - * - * @warning Before you set a cursor style you should have definen a -======= * applies only to toolbar item objects. * * @warning Before you set a cursor style you should have defined a ->>>>>>> remotes/origin/upstream * custom cursor previously on the item, with * elm_toolbar_item_cursor_set() * @@ -3908,10 +3020,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_unset( * * @deprecated Use elm_object_item_cursor_style_set() instead * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_style_set(Elm_Object_Item *it, const char *style); @@ -3927,10 +3035,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_style_ * * @deprecated Use elm_object_item_cursor_style_get() instead * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_toolbar_item_cursor_style_get(const Elm_Object_Item *it); @@ -3952,10 +3056,6 @@ EINA_DEPRECATED EAPI const char *elm_toolbar_item_cursor_style_ * * @deprecated Use elm_object_item_cursor_engine_only_set() instead * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only); @@ -3973,10 +3073,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_item_cursor_engine * * @deprecated Use elm_object_item_cursor_engine_only_get() instead * -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_item_cursor_engine_only_get(const Elm_Object_Item *it); @@ -3994,10 +3090,6 @@ EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_item_cursor_engine * @see elm_video_add() * @deprecated use elm_object_part_content_set() instead * -<<<<<<< HEAD - * @ingroup Video -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_player_video_set(Evas_Object *player, Evas_Object *video); @@ -4005,11 +3097,7 @@ EINA_DEPRECATED EAPI void elm_player_video_set(Evas_Object *player, Evas_Object * Set the label of item. * * @param it The item of segment control. -<<<<<<< HEAD - * @param text The label of item. -======= * @param label The label of item. ->>>>>>> remotes/origin/upstream * * The label to be displayed by the item. * Label will be at right of the icon (if set). @@ -4022,10 +3110,6 @@ EINA_DEPRECATED EAPI void elm_player_video_set(Evas_Object *player, Evas_Object * @see elm_segment_control_item_add() * @deprecated Use elm_object_item_text_set() instead * -<<<<<<< HEAD - * @ingroup SegmentControl -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_segment_control_item_label_set(Elm_Object_Item *it, const char *label); @@ -4042,11 +3126,7 @@ EINA_DEPRECATED EAPI void elm_segment_control_item_label_set(Elm_Ob * * Once the icon object is set, a previously set one will be deleted. * @warning Setting the same icon for two items will cause the icon to -<<<<<<< HEAD - * dissapear from the first item. -======= * disappear from the first item. ->>>>>>> remotes/origin/upstream * * If an icon was passed as argument on item creation, with function * elm_segment_control_item_add(), it will be already @@ -4056,10 +3136,6 @@ EINA_DEPRECATED EAPI void elm_segment_control_item_label_set(Elm_Ob * @see elm_segment_control_item_icon_get() * @deprecated Use elm_object_item_part_content_set() instead * -<<<<<<< HEAD - * @ingroup SegmentControl -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_segment_control_item_icon_set(Elm_Object_Item *it, Evas_Object *icon); @@ -4072,10 +3148,6 @@ EINA_DEPRECATED EAPI void elm_segment_control_item_icon_set(Elm_Obj * elm_segment_control_item_insert_at(). * * @deprecated Use elm_object_item_del() instead -<<<<<<< HEAD - * @ingroup SegmentControl -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_segment_control_item_del(Elm_Object_Item *it); @@ -4085,11 +3157,7 @@ EINA_DEPRECATED EAPI void elm_segment_control_item_del(Elm_Object_I * @param obj The multibuttonentry object * @return The label, or NULL if none * -<<<<<<< HEAD - * @deprecated Use elm_object_text_get() instead -======= * @deprecated Use elm_object_text_get() instead ->>>>>>> remotes/origin/upstream * */ EINA_DEPRECATED EAPI const char *elm_multibuttonentry_label_get(const Evas_Object *obj); @@ -4130,13 +3198,8 @@ EINA_DEPRECATED EAPI void elm_multibuttonentry_item_label_ * Delete a given item * * @param it The item -<<<<<<< HEAD - * - * @deprecated Use elm_object_item_del() instead -======= * * @deprecated Use elm_object_item_del() instead ->>>>>>> remotes/origin/upstream * */ EINA_DEPRECATED EAPI void elm_multibuttonentry_item_del(Elm_Object_Item *it); @@ -4151,10 +3214,6 @@ EINA_DEPRECATED EAPI void elm_multibuttonentry_item_del(El * the current view if the given item is a top one. * * @deprecated Use elm_object_item_del() instead -<<<<<<< HEAD - * @ingroup Naviframe -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_naviframe_item_del(Elm_Object_Item *it); @@ -4172,12 +3231,7 @@ EINA_DEPRECATED EAPI void elm_naviframe_item_del(Elm_Object_Item *it * enabled). * * @deprecated Use elm_object_item_disabled_set() instead -<<<<<<< HEAD - * - * @ingroup List -======= * ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled); @@ -4190,12 +3244,7 @@ EINA_DEPRECATED EAPI void elm_list_item_disabled_set(Elm * @see elm_list_item_disabled_set() for more details. * * @deprecated Use elm_object_item_disabled_get() instead -<<<<<<< HEAD - * - * @ingroup List -======= * ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Eina_Bool elm_list_item_disabled_get(const Elm_Object_Item *it); @@ -4212,16 +3261,9 @@ EINA_DEPRECATED EAPI Eina_Bool elm_list_item_disabled_get(con * @li item itself; * * This way, a data associated to a list item could be properly freed. -<<<<<<< HEAD - * - * @deprecated Please use elm_object_item_del_cb_set() instead. - * - * @ingroup List -======= * * @deprecated Please use elm_object_item_del_cb_set() instead. * ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func); @@ -4238,12 +3280,7 @@ EINA_DEPRECATED EAPI void elm_list_item_del_cb_set(Elm_O * @see elm_list_item_append() * * @deprecated Please use elm_object_item_data_get() instead. -<<<<<<< HEAD - * - * @ingroup List -======= * ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void *elm_list_item_data_get(const Elm_Object_Item *it); @@ -4263,10 +3300,6 @@ EINA_DEPRECATED EAPI void *elm_list_item_data_get(const E * @see elm_list_item_icon_set() * * @deprecated Please use elm_object_item_part_content_get(item, NULL); -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_list_item_icon_get(const Elm_Object_Item *it); @@ -4282,11 +3315,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_list_item_icon_get(const E * * Once the icon object is set, a previously set one will be deleted. * @warning Setting the same icon for two items will cause the icon to -<<<<<<< HEAD - * dissapear from the first item. -======= * disappear from the first item. ->>>>>>> remotes/origin/upstream * * If an icon was passed as argument on item creation, with function * elm_list_item_append() or similar, it will be already @@ -4296,10 +3325,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_list_item_icon_get(const E * @see elm_list_item_icon_get() * * @deprecated Please use elm_object_item_part_content_set(item, NULL, icon); -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_icon_set(Elm_Object_Item *it, Evas_Object *icon); @@ -4319,10 +3344,6 @@ EINA_DEPRECATED EAPI void elm_list_item_icon_set(Elm_Obj * @see elm_list_item_icon_set() * * @deprecated Please use elm_object_item_part_content_get(item, "end"); -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Evas_Object *elm_list_item_end_get(const Elm_Object_Item *it); @@ -4338,11 +3359,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_list_item_end_get(const El * * Once the icon object is set, a previously set one will be deleted. * @warning Setting the same icon for two items will cause the icon to -<<<<<<< HEAD - * dissapear from the first item. -======= * disappear from the first item. ->>>>>>> remotes/origin/upstream * * If an icon was passed as argument on item creation, with function * elm_list_item_append() or similar, it will be already @@ -4352,10 +3369,6 @@ EINA_DEPRECATED EAPI Evas_Object *elm_list_item_end_get(const El * @see elm_list_item_end_get() * * @deprecated Please use elm_object_item_part_content_set(item, "end", end); -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_end_set(Elm_Object_Item *it, Evas_Object *end); @@ -4374,10 +3387,6 @@ EINA_DEPRECATED EAPI void elm_list_item_end_set(Elm_Obje * @see elm_list_item_append() * * @deprecated Please use elm_object_item_text_get(item); -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_list_item_label_get(const Elm_Object_Item *it); @@ -4398,10 +3407,6 @@ EINA_DEPRECATED EAPI const char *elm_list_item_label_get(const * @see elm_list_item_append() * * @deprecated Please use elm_object_item_text_set(item, text); -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_label_set(Elm_Object_Item *it, const char *text); @@ -4418,10 +3423,6 @@ EINA_DEPRECATED EAPI void elm_list_item_label_set(Elm_Ob * @deprecated Use elm_object_item_tooltip_text_set() instead * @see elm_object_tooltip_text_set() for more details. * -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_tooltip_text_set(Elm_Object_Item *it, const char *text); @@ -4431,11 +3432,7 @@ EINA_DEPRECATED EAPI void elm_list_item_tooltip_text_set * @param disable If EINA_TRUE, size restrictions are disabled * @return EINA_FALSE on failure, EINA_TRUE on success * -<<<<<<< HEAD - * This function allows a tooltip to expand beyond its parant window's canvas. -======= * This function allows a tooltip to expand beyond its parent window's canvas. ->>>>>>> remotes/origin/upstream * It will instead be limited only by the size of the display. * * @deprecated Use elm_object_item_tooltip_window_mode_set() instead @@ -4449,11 +3446,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_list_item_tooltip_window_m * @return If EINA_TRUE, size restrictions are disabled * * This function returns whether a tooltip is allowed to expand beyond -<<<<<<< HEAD - * its parant window's canvas. -======= * its parent window's canvas. ->>>>>>> remotes/origin/upstream * It will instead be limited only by the size of the display. * * @deprecated Use elm_object_item_tooltip_window_mode_get() instead @@ -4483,10 +3476,6 @@ EINA_DEPRECATED EAPI Eina_Bool elm_list_item_tooltip_window_m * * @see elm_object_tooltip_content_cb_set() for more details. * -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); @@ -4503,10 +3492,6 @@ EINA_DEPRECATED EAPI void elm_list_item_tooltip_content_ * @see elm_object_tooltip_unset() for more details. * @see elm_list_item_tooltip_content_cb_set() * -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_tooltip_unset(Elm_Object_Item *it); @@ -4524,21 +3509,13 @@ EINA_DEPRECATED EAPI void elm_list_item_tooltip_unset(El * @deprecated Use elm_object_item_tooltip_style_set() instead * @see elm_object_tooltip_style_set() for more details. * -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_tooltip_style_set(Elm_Object_Item *it, const char *style); /** * Get the style for this item tooltip. * -<<<<<<< HEAD - * @param item list item with tooltip already set. -======= * @param it list item with tooltip already set. ->>>>>>> remotes/origin/upstream * @return style the theme style in use, defaults to "default". If the * object does not have a tooltip set, then NULL is returned. * @@ -4547,10 +3524,6 @@ EINA_DEPRECATED EAPI void elm_list_item_tooltip_style_se * @see elm_object_tooltip_style_get() for more details. * @see elm_list_item_tooltip_style_set() * -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_list_item_tooltip_style_get(const Elm_Object_Item *it); @@ -4575,10 +3548,6 @@ EINA_DEPRECATED EAPI const char *elm_list_item_tooltip_style_ge * @see elm_list_item_cursor_unset() * * @deprecated Please use elm_object_item_cursor_set() instead -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_cursor_set(Elm_Object_Item *it, const char *cursor); @@ -4594,12 +3563,7 @@ EINA_DEPRECATED EAPI void elm_list_item_cursor_set(Elm_O * @see elm_list_item_cursor_set() * @see elm_list_item_cursor_unset() * -<<<<<<< HEAD - * @deprecated Please use elm_object_item_cursor_get() insteas - * @ingroup List -======= * @deprecated Please use elm_object_item_cursor_get() instead ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_list_item_cursor_get(const Elm_Object_Item *it); @@ -4617,10 +3581,6 @@ EINA_DEPRECATED EAPI const char *elm_list_item_cursor_get(const * @see elm_list_item_cursor_set() * * @deprecated Please use elm_list_item_cursor_unset() instead -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_cursor_unset(Elm_Object_Item *it); @@ -4636,15 +3596,9 @@ EINA_DEPRECATED EAPI void elm_list_item_cursor_unset(Elm * cursor decorations defined in a theme file, which can have, * given a cursor name/type, alternate styles on it. It * works analogously as elm_object_cursor_style_set(), but here -<<<<<<< HEAD - * applyed only to list item objects. - * - * @warning Before you set a cursor style you should have definen a -======= * applies only to list item objects. * * @warning Before you set a cursor style you should have defined a ->>>>>>> remotes/origin/upstream * custom cursor previously on the item, with * elm_list_item_cursor_set() * @@ -4652,10 +3606,6 @@ EINA_DEPRECATED EAPI void elm_list_item_cursor_unset(Elm * @see elm_list_item_cursor_style_get() * * @deprecated Please use elm_list_item_cursor_style_set() instead -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_cursor_style_set(Elm_Object_Item *it, const char *style); @@ -4670,10 +3620,6 @@ EINA_DEPRECATED EAPI void elm_list_item_cursor_style_set * @see elm_list_item_cursor_style_set() for more details * * @deprecated Please use elm_list_item_cursor_style_get() instead -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI const char *elm_list_item_cursor_style_get(const Elm_Object_Item *it); @@ -4694,10 +3640,6 @@ EINA_DEPRECATED EAPI const char *elm_list_item_cursor_style_get * provided by the rendering engine. * * @deprecated Please use elm_list_item_cursor_engine_only_set() instead -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_list_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only); @@ -4714,16 +3656,10 @@ EINA_DEPRECATED EAPI void elm_list_item_cursor_engine_on * @see elm_list_item_cursor_engine_only_set(), for more details * * @deprecated Please use elm_list_item_cursor_engine_only_get() instead -<<<<<<< HEAD - * @ingroup List -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Eina_Bool elm_list_item_cursor_engine_only_get(const Elm_Object_Item *it); /** -<<<<<<< HEAD -======= * Delete the item from the list. * * @param it The item of list to be deleted. @@ -4740,27 +3676,18 @@ EINA_DEPRECATED EAPI Eina_Bool elm_list_item_cursor_engine_on EINA_DEPRECATED EAPI void elm_list_item_del(Elm_Object_Item *it); /** ->>>>>>> remotes/origin/upstream * Set the shrink state of toolbar @p obj. * * @param obj The toolbar object. * @param shrink_mode Toolbar's items display behavior. * * The toolbar won't scroll if #ELM_TOOLBAR_SHRINK_NONE, -<<<<<<< HEAD - * but will enforce a minimun size so all the items will fit, won't scroll -======= * but will enforce a minimum size so all the items will fit, won't scroll ->>>>>>> remotes/origin/upstream * and won't show the items that don't fit if #ELM_TOOLBAR_SHRINK_HIDE, * will scroll if #ELM_TOOLBAR_SHRINK_SCROLL, and will create a button to * pop up excess elements with #ELM_TOOLBAR_SHRINK_MENU. * * @deprecated Please use elm_toolbar_shrink_mode_set(obj, shrink_mode); -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI void elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode); @@ -4773,10 +3700,6 @@ EINA_DEPRECATED EAPI void elm_toolbar_mode_shrink_set(Ev * @see elm_toolbar_shrink_mode_set() for details. * * @deprecated Please use elm_toolbar_shrink_mode_get(obj); -<<<<<<< HEAD - * @ingroup Toolbar -======= ->>>>>>> remotes/origin/upstream */ EINA_DEPRECATED EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_mode_shrink_get(const Evas_Object *obj); @@ -4861,30 +3784,6 @@ EAPI Evas_Object *elm_entry_end_get(const Evas_Object *obj); EINA_DEPRECATED EAPI Evas_Object *elm_entry_end_unset(Evas_Object *obj); /** -<<<<<<< HEAD - * Set the autocapitalization on the immodule. - * - * @param obj The entry object - * @param autocap EINA_TRUE if autocapitalization is needed - * @deprecated Use elm_entry_autocapital_type_set() instead - */ -EINA_DEPRECATED EAPI void elm_entry_autocapitalization_set(Evas_Object *obj, Eina_Bool autocap); - -EINA_DEPRECATED EAPI void elm_entry_autoperiod_set(Evas_Object *obj, Eina_Bool autoperiod); - -/** - * Set whether the return key on the input panel is disabled automatically when entry has no text. - * - * If @p on is EINA_TRUE, The return key on input panel is disabled when the entry has no text. - * The return Key on the input panel is automatically enabled when the entry has text. - * The default value is EINA_FALSE. - * - * @param obj The entry object - * @param on If @p on is EINA_TRUE, the return key is automatically disabled when the entry has no text. - * @deprecated Use elm_entry_input_panel_return_key_autoenabled_set() instead - */ -EINA_DEPRECATED EAPI void elm_entry_autoenable_returnkey_set(Evas_Object *obj, Eina_Bool on); -======= * Set route service to be used. By default used source is * #ELM_MAP_ROUTE_SOURCE_YOURS. * @@ -4899,7 +3798,6 @@ typedef enum ELM_MAP_ROUTE_SOURCE_ORS, /**< Open Route Service: http://www.openrouteservice.org/ . It's not working with Map yet. */ ELM_MAP_ROUTE_SOURCE_LAST } Elm_Map_Route_Sources; ->>>>>>> remotes/origin/upstream /** * Convert a pixel coordinate into a rotated pixel coordinate. @@ -4909,107 +3807,6 @@ typedef enum * @param y vertical coordinate of the point to rotate. * @param cx rotation's center horizontal position. * @param cy rotation's center vertical position. -<<<<<<< HEAD - * @param degree amount of degrees from 0.0 to 360.0 to rotate arount Z axis. - * @param xx Pointer where to store rotated x. - * @param yy Pointer where to store rotated y. - * - * @ingroup Map - * @deprecated Rotation is not needed to know. Use elm_map_canvas_to_geo_convert() instead - */ -EINA_DEPRECATED EAPI void elm_map_utils_rotate_coord(const Evas_Object *obj, const Evas_Coord x, const Evas_Coord y, const Evas_Coord cx, const Evas_Coord cy, const double degree, Evas_Coord *xx, Evas_Coord *yy); - -// All elm_editfield APIs were deprecated. -EINA_DEPRECATED Evas_Object *elm_editfield_add(Evas_Object *parent); -EINA_DEPRECATED void elm_editfield_label_set(Evas_Object *obj, const char *label); -EINA_DEPRECATED const char *elm_editfield_label_get(Evas_Object *obj); -EINA_DEPRECATED void elm_editfield_guide_text_set(Evas_Object *obj, const char *text); -EINA_DEPRECATED const char *elm_editfield_guide_text_get(Evas_Object *obj); -EINA_DEPRECATED Evas_Object *elm_editfield_entry_get(Evas_Object *obj); -EINA_DEPRECATED void elm_editfield_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line); -EINA_DEPRECATED Eina_Bool elm_editfield_entry_single_line_get(Evas_Object *obj); -EINA_DEPRECATED void elm_editfield_eraser_set(Evas_Object *obj, Eina_Bool visible); -EINA_DEPRECATED Eina_Bool elm_editfield_eraser_get(Evas_Object *obj); - -/** - * @defgroup Searchbar Searchbar - * @addtogroup Searchbar - * @{ - * @ingroup Elementary - * - * This is Searchbar. - * It can contain a simple entry and button object. - */ - - /** - * Add a new searchbar to the parent - * @param parent The parent object - * @return The new object or NULL if it cannot be created - */ - EINA_DEPRECATED Evas_Object *elm_searchbar_add(Evas_Object *parent); - /** - * set the text of entry - * - * @param obj The searchbar object - * @return void - */ - EINA_DEPRECATED void elm_searchbar_text_set(Evas_Object *obj, const char *entry); - /** - * get the text of entry - * - * @param obj The searchbar object - * @return string pointer of entry - */ - EINA_DEPRECATED const char *elm_searchbar_text_get(Evas_Object *obj); - /** - * get the pointer of entry - * - * @param obj The searchbar object - * @return the entry object - */ - EINA_DEPRECATED Evas_Object *elm_searchbar_entry_get(Evas_Object *obj); - /** - * get the pointer of editfield - * - * @param obj The searchbar object - * @return the editfield object - */ - EINA_DEPRECATED Evas_Object *elm_searchbar_editfield_get(Evas_Object *obj); - /** - * set the cancel button animation flag - * - * @param obj The searchbar object - * @param cancel_btn_ani_flag The flag of animating cancen button or not - * @return void - */ - EINA_DEPRECATED void elm_searchbar_cancel_button_animation_set(Evas_Object *obj, Eina_Bool cancel_btn_ani_flag); - /** - * set the cancel button show mode - * - * @param obj The searchbar object - * @param visible The flag of cancen button show or not - * @return void - */ - EINA_DEPRECATED void elm_searchbar_cancel_button_set(Evas_Object *obj, Eina_Bool visible); - /** - * clear searchbar status - * - * @param obj The searchbar object - * @return void - */ - EINA_DEPRECATED void elm_searchbar_clear(Evas_Object *obj); - /** - * set the searchbar boundary rect mode(with bg rect) set - * - * @param obj The searchbar object - * @param boundary The present flag of boundary rect or not - * @return void - */ - EINA_DEPRECATED void elm_searchbar_boundary_rect_set(Evas_Object *obj, Eina_Bool boundary); - /** - * @} - */ -======= * @param degree amount of degrees from 0.0 to 360.0 to rotate around Z axis. * @param xx Pointer where to store rotated x. * @param yy Pointer where to store rotated y. @@ -7536,4 +6333,3 @@ EINA_DEPRECATED EAPI Eina_Bool elm_genlist_edit_mode_get(const Evas_Obj /** * @} */ ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_deprecated_before.h b/src/lib/elm_deprecated_before.h deleted file mode 100644 index 86ac8f9..0000000 --- a/src/lib/elm_deprecated_before.h +++ /dev/null @@ -1,20 +0,0 @@ -/* TEMPORARY: DOCS WILL BE FILLED IN WITH CNP/SED */ -// XXX: elm_gen -> kill. -typedef struct Elm_Gen_Item Elm_Gen_Item; -typedef struct _Elm_Gen_Item_Class Elm_Gen_Item_Class; -typedef struct _Elm_Gen_Item_Class_Func Elm_Gen_Item_Class_Func; /**< Class functions for gen item classes. */ -typedef char *(*Elm_Gen_Item_Text_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gen item classes. */ -typedef Evas_Object *(*Elm_Gen_Item_Content_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< Content(swallowed object) fetching class function for gen item classes. */ -typedef Eina_Bool (*Elm_Gen_Item_State_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gen item classes. */ -typedef void (*Elm_Gen_Item_Del_Cb)(void *data, Evas_Object *obj); /**< Deletion class function for gen item classes. */ -struct _Elm_Gen_Item_Class -{ - const char *item_style; - struct _Elm_Gen_Item_Class_Func - { - Elm_Gen_Item_Text_Get_Cb text_get; - Elm_Gen_Item_Content_Get_Cb content_get; - Elm_Gen_Item_State_Get_Cb state_get; - Elm_Gen_Item_Del_Cb del; - } func; -}; diff --git a/src/lib/elm_engine.h b/src/lib/elm_engine.h deleted file mode 100644 index 1be77ab..0000000 --- a/src/lib/elm_engine.h +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @defgroup Engine Elementary Engine - * - * These are functions setting and querying which rendering engine - * Elementary will use for drawing its windows' pixels. - * - * The following are the available engines: - * @li "software_x11" - * @li "fb" - * @li "directfb" - * @li "software_16_x11" - * @li "software_8_x11" - * @li "xrender_x11" - * @li "opengl_x11" - * @li "software_gdi" - * @li "software_16_wince_gdi" - * @li "sdl" - * @li "software_16_sdl" - * @li "opengl_sdl" - * @li "buffer" - * @li "ews" - * @li "opengl_cocoa" - * @li "psl1ght" - * - * @{ - */ - -/** - * @brief Get Elementary's rendering engine in use. - * - * @return The rendering engine's name - * @note there's no need to free the returned string, here. - * - * This gets the global rendering engine that is applied to all Elementary - * applications. - * - * @see elm_engine_set() - */ -// XXX: rename to elm_engine_get() -EAPI const char *elm_engine_current_get(void); - -/** - * @brief Set Elementary's rendering engine for use. - * - * @param engine The rendering engine's name - * - * This sets global rendering engine that is applied to all Elementary - * applications. Note that it will take effect only to Elementary windows - * created after this is called. - * - * @see elm_win_add() - */ -EAPI void elm_engine_set(const char *engine); - -/** - * @} - */ diff --git a/src/lib/elm_finger.h b/src/lib/elm_finger.h index 15b2744..f86482a 100644 --- a/src/lib/elm_finger.h +++ b/src/lib/elm_finger.h @@ -16,42 +16,6 @@ */ /** -<<<<<<< HEAD - * Get the configured "finger size" - * - * @return The finger size - * - * This gets the globally configured finger size, in pixels - * - * @ingroup Fingers - */ -EAPI Evas_Coord elm_finger_size_get(void); - -/** - * Set the configured finger size - * - * This sets the globally configured finger size in pixels - * - * @param size The finger size - * @ingroup Fingers - */ -EAPI void elm_finger_size_set(Evas_Coord size); - -/** - * Set the configured finger size for all applications on the display - * - * This sets the globally configured finger size in pixels for all - * applications on the display - * - * @param size The finger size - * @ingroup Fingers - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_finger_size_all_set(Evas_Coord size); - -/** -======= ->>>>>>> remotes/origin/upstream * Adjust size of an element for finger usage. * * @param times_w How many fingers should fit horizontally @@ -67,11 +31,7 @@ EAPI void elm_finger_size_all_set(Evas_Coord size); * accommodate it. On return the @p w and @p h sizes pointed to by * these parameters will be modified, on those conditions. * -<<<<<<< HEAD - * @note This is kind of a low level Elementary call, most useful -======= * @note This is kind of low level Elementary call, most useful ->>>>>>> remotes/origin/upstream * on size evaluation times for widgets. An external user wouldn't * be calling, most of the time. * diff --git a/src/lib/elm_font.c b/src/lib/elm_font.c index 57cb97a..43e9ebc 100644 --- a/src/lib/elm_font.c +++ b/src/lib/elm_font.c @@ -24,10 +24,7 @@ _elm_font_properties_get(Eina_Hash **font_hash, len = s1 - font; name = calloc(sizeof(char), len + 1); -<<<<<<< HEAD -======= if (!name) return NULL; ->>>>>>> remotes/origin/upstream strncpy(name, font, len); /* get subname (should be english) */ @@ -36,16 +33,11 @@ _elm_font_properties_get(Eina_Hash **font_hash, { len = s2 - name; name = realloc(name, sizeof(char) * len + 1); -<<<<<<< HEAD - memset(name, 0, sizeof(char) * len + 1); - strncpy(name, font, len); -======= if (name) { memset(name, 0, sizeof(char) * len + 1); strncpy(name, font, len); } ->>>>>>> remotes/origin/upstream } if (!strncmp(s1, ELM_FONT_TOKEN_STYLE, strlen(ELM_FONT_TOKEN_STYLE))) @@ -56,14 +48,6 @@ _elm_font_properties_get(Eina_Hash **font_hash, if (!efp) { efp = calloc(1, sizeof(Elm_Font_Properties)); -<<<<<<< HEAD - efp->name = eina_stringshare_add(name); - if (font_hash) - { - if (!*font_hash) - *font_hash = eina_hash_string_superfast_new(NULL); - eina_hash_add(*font_hash, name, efp); -======= if (efp) { efp->name = eina_stringshare_add(name); @@ -72,7 +56,6 @@ _elm_font_properties_get(Eina_Hash **font_hash, *font_hash = eina_hash_string_superfast_new(NULL); eina_hash_add(*font_hash, name, efp); } ->>>>>>> remotes/origin/upstream } } s2 = strchr(style, ','); @@ -83,12 +66,6 @@ _elm_font_properties_get(Eina_Hash **font_hash, len = s2 - style; style_old = style; style = calloc(sizeof(char), len + 1); -<<<<<<< HEAD - strncpy(style, style_old, len); - efp->styles = eina_list_append(efp->styles, - eina_stringshare_add(style)); - free(style); -======= if (style) { strncpy(style, style_old, len); @@ -96,7 +73,6 @@ _elm_font_properties_get(Eina_Hash **font_hash, eina_stringshare_add(style)); free(style); } ->>>>>>> remotes/origin/upstream } else efp->styles = eina_list_append(efp->styles, @@ -110,14 +86,6 @@ _elm_font_properties_get(Eina_Hash **font_hash, if (!efp) { efp = calloc(1, sizeof(Elm_Font_Properties)); -<<<<<<< HEAD - efp->name = eina_stringshare_add(font); - if (font_hash) - { - if (!*font_hash) - *font_hash = eina_hash_string_superfast_new(NULL); - eina_hash_add(*font_hash, font, efp); -======= if (efp) { efp->name = eina_stringshare_add(font); @@ -126,17 +94,12 @@ _elm_font_properties_get(Eina_Hash **font_hash, *font_hash = eina_hash_string_superfast_new(NULL); eina_hash_add(*font_hash, font, efp); } ->>>>>>> remotes/origin/upstream } } } return efp; } -<<<<<<< HEAD -/* FIXME: do we really need it? */ -======= ->>>>>>> remotes/origin/upstream Eina_Hash * _elm_font_available_hash_add(Eina_Hash *font_hash, const char *full_name) @@ -170,11 +133,6 @@ _font_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void _elm_font_available_hash_del(Eina_Hash *hash) { -<<<<<<< HEAD - if (!hash) return ; - - eina_hash_foreach(hash, _font_hash_free_cb, NULL); -======= if (!hash) return; eina_hash_foreach(hash, _font_hash_free_cb, NULL); @@ -260,5 +218,4 @@ EAPI void elm_font_available_hash_del(Eina_Hash *hash) { _elm_font_available_hash_del(hash); ->>>>>>> remotes/origin/upstream } diff --git a/src/lib/elm_general.h b/src/lib/elm_general.h index 35a0909..39fd1bd 100644 --- a/src/lib/elm_general.h +++ b/src/lib/elm_general.h @@ -94,8 +94,6 @@ typedef enum ELM_FOCUS_NEXT } Elm_Focus_Direction; -<<<<<<< HEAD -======= typedef enum { ELM_OBJECT_SELECT_MODE_DEFAULT = 0, /**< default select mode */ @@ -105,7 +103,6 @@ typedef enum ELM_OBJECT_SELECT_MODE_MAX } Elm_Object_Select_Mode; ->>>>>>> remotes/origin/upstream /** * @typedef Elm_Object_Item * An Elementary Object item handle. diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index db72581..d0ff832 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -4,12 +4,9 @@ #include "els_scroller.h" #include "elm_gen_common.h" -<<<<<<< HEAD -======= // internally allocated #define CLASS_ALLOCATED 0x3a70f00f ->>>>>>> remotes/origin/upstream /* -- * TODO: * Handle non-homogeneous objects too. @@ -62,13 +59,7 @@ struct _Widget_Data Eina_Bool reorder_mode : 1; Eina_Bool on_hold : 1; Eina_Bool multi : 1; -<<<<<<< HEAD - Eina_Bool no_select : 1; Eina_Bool wasselected : 1; - Eina_Bool always_select : 1; -======= - Eina_Bool wasselected : 1; ->>>>>>> remotes/origin/upstream Eina_Bool clear_me : 1; Eina_Bool h_bounce : 1; Eina_Bool v_bounce : 1; @@ -111,13 +102,6 @@ static Eina_Bool _event_hook(Evas_Object *obj, Evas_Callback_Type type, void *event_info); static Eina_Bool _deselect_all_items(Widget_Data *wd); -<<<<<<< HEAD -#if 1 -static void _elm_gengrid_clear(Evas_Object *obj, - Eina_Bool standby); -#endif -======= ->>>>>>> remotes/origin/upstream static Evas_Smart_Class _pan_sc = EVAS_SMART_CLASS_INIT_VERSION; static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); @@ -146,10 +130,7 @@ static const char SIG_EDGE_BOTTOM[] = "edge,bottom"; static const char SIG_EDGE_LEFT[] = "edge,left"; static const char SIG_EDGE_RIGHT[] = "edge,right"; static const char SIG_MOVED[] = "moved"; -<<<<<<< HEAD -======= static const char SIG_INDEX_UPDATE[] = "index,update"; ->>>>>>> remotes/origin/upstream static const Evas_Smart_Cb_Description _signals[] = { {SIG_ACTIVATED, ""}, @@ -295,24 +276,16 @@ _event_hook(Evas_Object *obj, else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) { it = elm_gengrid_first_item_get(obj); -<<<<<<< HEAD - elm_gengrid_item_bring_in(it); -======= elm_gengrid_item_bring_in(it, ELM_GENGRID_ITEM_SCROLLTO_IN); elm_gengrid_item_selected_set(it, EINA_TRUE); ->>>>>>> remotes/origin/upstream ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) { it = elm_gengrid_last_item_get(obj); -<<<<<<< HEAD - elm_gengrid_item_bring_in(it); -======= elm_gengrid_item_bring_in(it, ELM_GENGRID_ITEM_SCROLLTO_IN); elm_gengrid_item_selected_set(it, EINA_TRUE); ->>>>>>> remotes/origin/upstream ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } @@ -394,20 +367,12 @@ _item_multi_select_left(Widget_Data *wd) { elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = prev; -<<<<<<< HEAD - elm_gengrid_item_show(wd->last_selected_item); -======= elm_gengrid_item_show(wd->last_selected_item, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream } else { elm_gengrid_item_selected_set(prev, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show(prev); -======= elm_gengrid_item_show(prev, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream } return EINA_TRUE; @@ -425,20 +390,12 @@ _item_multi_select_right(Widget_Data *wd) { elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = next; -<<<<<<< HEAD - elm_gengrid_item_show(wd->last_selected_item); -======= elm_gengrid_item_show(wd->last_selected_item, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream } else { elm_gengrid_item_selected_set(next, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show(next); -======= elm_gengrid_item_show(next, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream } return EINA_TRUE; @@ -485,11 +442,7 @@ _item_single_select_up(Widget_Data *wd) while ((prev) && (prev->generation < wd->generation)) prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); elm_gengrid_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show((Elm_Object_Item *) prev); -======= elm_gengrid_item_show((Elm_Object_Item *) prev, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } else @@ -508,11 +461,7 @@ _item_single_select_up(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show((Elm_Object_Item *) prev); -======= elm_gengrid_item_show((Elm_Object_Item *) prev, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } @@ -529,11 +478,7 @@ _item_single_select_down(Widget_Data *wd) while ((next) && (next->generation < wd->generation)) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); elm_gengrid_item_selected_set((Elm_Object_Item *) next, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show((Elm_Object_Item *) next); -======= elm_gengrid_item_show((Elm_Object_Item *) next, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } else @@ -552,11 +497,7 @@ _item_single_select_down(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) next, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show((Elm_Object_Item *) next); -======= elm_gengrid_item_show((Elm_Object_Item *) next, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } @@ -578,11 +519,7 @@ _item_single_select_left(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show((Elm_Object_Item *) prev); -======= elm_gengrid_item_show((Elm_Object_Item *) prev, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } @@ -604,11 +541,7 @@ _item_single_select_right(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) next, EINA_TRUE); -<<<<<<< HEAD - elm_gengrid_item_show((Elm_Object_Item *) next); -======= elm_gengrid_item_show((Elm_Object_Item *) next, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } @@ -645,11 +578,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) while (it) { edje_object_mirrored_set(VIEW(it), rtl); -<<<<<<< HEAD - elm_gengrid_item_update((Elm_Object_Item *) it); -======= elm_gengrid_item_update((Elm_Object_Item *)it); ->>>>>>> remotes/origin/upstream it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); } } @@ -779,11 +708,7 @@ _mouse_move(void *data, } return; } -<<<<<<< HEAD - if (!it->display_only) -======= if (it->select_mode != ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ->>>>>>> remotes/origin/upstream elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_geometry_get(obj, &x, &y, NULL, NULL); x = ev->cur.canvas.x - x; @@ -957,11 +882,7 @@ _mouse_up(void *data, if (dragged) { if (it->want_unrealize) -<<<<<<< HEAD - _elm_gengrid_item_unrealize(it, EINA_FALSE); -======= _elm_genlist_item_unrealize(it, EINA_FALSE); ->>>>>>> remotes/origin/upstream } if (elm_widget_item_disabled_get(it) || (dragged)) return; if (it->wd->multi) @@ -996,20 +917,14 @@ _mouse_up(void *data, static void _item_highlight(Elm_Gen_Item *it) { -<<<<<<< HEAD - if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->highlighted)) return; -======= if ((it->wd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) || (it->wd->no_highlight) || (it->highlighted) || (it->generation < it->wd->generation)) return; ->>>>>>> remotes/origin/upstream edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); it->highlighted = EINA_TRUE; } static void -<<<<<<< HEAD -======= _elm_gengrid_item_index_update(Elm_Gen_Item *it) { if (it->position_update) @@ -1020,7 +935,6 @@ _elm_gengrid_item_index_update(Elm_Gen_Item *it) } static void ->>>>>>> remotes/origin/upstream _item_realize(Elm_Gen_Item *it) { char buf[1024]; @@ -1139,11 +1053,8 @@ _item_realize(Elm_Gen_Item *it) evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it); -<<<<<<< HEAD -======= _elm_gengrid_item_index_update(it); ->>>>>>> remotes/origin/upstream if (it->selected) edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); if (elm_widget_item_disabled_get(it)) @@ -1180,32 +1091,18 @@ static Eina_Bool _reorder_item_moving_effect_timer_cb(void *data) { Elm_Gen_Item *it = data; -<<<<<<< HEAD - double time, t; - Evas_Coord dx, dy; - - time = REORDER_EFFECT_TIME; -======= double tt, t; Evas_Coord dx, dy; tt = REORDER_EFFECT_TIME; ->>>>>>> remotes/origin/upstream t = ((0.0 > (t = ecore_loop_time_get()-it->item->moving_effect_start_time)) ? 0.0 : t); dx = ((it->item->tx - it->item->ox) / 10) * _elm_config->scale; dy = ((it->item->ty - it->item->oy) / 10) * _elm_config->scale; -<<<<<<< HEAD - if (t <= time) - { - it->item->rx += (1 * sin((t / time) * (M_PI / 2)) * dx); - it->item->ry += (1 * sin((t / time) * (M_PI / 2)) * dy); -======= if (t <= tt) { it->item->rx += (1 * sin((t / tt) * (M_PI / 2)) * dx); it->item->ry += (1 * sin((t / tt) * (M_PI / 2)) * dy); ->>>>>>> remotes/origin/upstream } else { @@ -1280,11 +1177,7 @@ _group_item_place(Pan *sd) evas_object_raise(VIEW(it)); } else -<<<<<<< HEAD - _elm_gengrid_item_unrealize(it, EINA_FALSE); -======= _elm_genlist_item_unrealize(it, EINA_FALSE); ->>>>>>> remotes/origin/upstream } } @@ -1311,11 +1204,7 @@ _item_place(Elm_Gen_Item *it, alignh = 0; alignw = 0; -<<<<<<< HEAD - items_count = it->wd->count - eina_list_count(it->wd->group_items) + it->wd->items_lost; -======= items_count = it->wd->item_count - eina_list_count(it->wd->group_items) + it->wd->items_lost; ->>>>>>> remotes/origin/upstream if (it->wd->horizontal) { int columns, items_visible = 0, items_row; @@ -1333,17 +1222,10 @@ _item_place(Elm_Gen_Item *it, alignw = (vw - tcw) * it->wd->align_x; items_row = items_visible; -<<<<<<< HEAD - if (items_row > it->wd->count) - items_row = it->wd->count; - if (it->wd->filled - && (unsigned int)it->wd->nmax > (unsigned int)it->wd->count) -======= if ((unsigned int)items_row > it->wd->item_count) items_row = it->wd->item_count; if (it->wd->filled && (unsigned int)it->wd->nmax > (unsigned int)it->wd->item_count) ->>>>>>> remotes/origin/upstream tch = it->wd->nmax * it->wd->item_height; else tch = items_row * it->wd->item_height; @@ -1351,11 +1233,7 @@ _item_place(Elm_Gen_Item *it, } else { -<<<<<<< HEAD - int rows, items_visible = 0, items_col; -======= unsigned int rows, items_visible = 0, items_col; ->>>>>>> remotes/origin/upstream if (it->wd->item_width > 0) items_visible = vw / it->wd->item_width; @@ -1370,17 +1248,10 @@ _item_place(Elm_Gen_Item *it, alignh = (vh - tch) * it->wd->align_y; items_col = items_visible; -<<<<<<< HEAD - if (items_col > it->wd->count) - items_col = it->wd->count; - if (it->wd->filled - && (unsigned int)it->wd->nmax > (unsigned int)it->wd->count) -======= if (items_col > it->wd->item_count) items_col = it->wd->item_count; if (it->wd->filled && (unsigned int)it->wd->nmax > (unsigned int)it->wd->item_count) ->>>>>>> remotes/origin/upstream tcw = it->wd->nmax * it->wd->item_width; else tcw = items_col * it->wd->item_width; @@ -1578,19 +1449,13 @@ _item_place(Elm_Gen_Item *it, else { if (!it->group) -<<<<<<< HEAD - _elm_gengrid_item_unrealize(it, EINA_FALSE); -======= _elm_genlist_item_unrealize(it, EINA_FALSE); ->>>>>>> remotes/origin/upstream else it->item->group_realized = EINA_FALSE; } } static void -<<<<<<< HEAD -======= _item_position_update(Eina_Inlist *list, int idx) { Elm_Gen_Item *it; @@ -1603,23 +1468,16 @@ _item_position_update(Eina_Inlist *list, int idx) } static void ->>>>>>> remotes/origin/upstream _item_del(Elm_Gen_Item *it) { Evas_Object *obj = WIDGET(it); evas_event_freeze(evas_object_evas_get(obj)); it->wd->selected = eina_list_remove(it->wd->selected, it); -<<<<<<< HEAD - if (it->realized) _elm_gengrid_item_unrealize(it, EINA_FALSE); - it->wd->count--; - _elm_gengrid_item_del_serious(it); -======= if (it->realized) _elm_genlist_item_unrealize(it, EINA_FALSE); it->wd->item_count--; _elm_genlist_item_del_serious(it); elm_gengrid_item_class_unref((Elm_Gengrid_Item_Class *)it->itc); ->>>>>>> remotes/origin/upstream evas_event_thaw(evas_object_evas_get(obj)); evas_event_thaw_eval(evas_object_evas_get(obj)); } @@ -1680,11 +1538,7 @@ _calc_job(void *data) count++; } } -<<<<<<< HEAD - count = wd->count + wd->items_lost - count_group; -======= count = wd->item_count + wd->items_lost - count_group; ->>>>>>> remotes/origin/upstream if (wd->horizontal) { minw = (ceil(count / (float)nmax) * wd->item_width) + (count_group * wd->group_item_width); @@ -2012,18 +1866,6 @@ _scr_scroll(void *data, } static int -<<<<<<< HEAD -_elm_gengrid_item_compare_data(const void *data, const void *data1) -{ - const Elm_Gen_Item *it = data; - const Elm_Gen_Item *item1 = data1; - - return it->wd->item_compare_data_cb(it->base.data, item1->base.data); -} - -static int -======= ->>>>>>> remotes/origin/upstream _elm_gengrid_item_compare(const void *data, const void *data1) { Elm_Gen_Item *it, *item1; @@ -2035,12 +1877,7 @@ _elm_gengrid_item_compare(const void *data, const void *data1) static void _item_disable_hook(Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; -======= Elm_Gen_Item *_it = (Elm_Gen_Item *)it; ->>>>>>> remotes/origin/upstream if (_it->generation < _it->wd->generation) return; @@ -2056,127 +1893,16 @@ _item_disable_hook(Elm_Object_Item *it) static void _item_del_pre_hook(Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; - if ((_it->relcount > 0) || (_it->walking > 0)) - { - _elm_gengrid_item_del_notserious(_it); -======= Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if ((_it->relcount > 0) || (_it->walking > 0)) { _elm_genlist_item_del_notserious(_it); ->>>>>>> remotes/origin/upstream return; } _item_del(_it); } -<<<<<<< HEAD -#if 1 -void -_item_select(Elm_Gen_Item *it) -{ - if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->mode_set)) return; - if (!it->selected) - { - it->selected = EINA_TRUE; - it->wd->selected = eina_list_append(it->wd->selected, it); - } - else if (!it->wd->always_select) return; - - evas_object_ref(WIDGET(it)); - it->walking++; - it->wd->walking++; - if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), it); - if (it->generation == it->wd->generation) - evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, it); - it->walking--; - it->wd->walking--; - evas_object_unref(WIDGET(it)); - if ((it->wd->clear_me) && (!it->wd->walking)) - _elm_gengrid_clear(WIDGET(it), EINA_TRUE); - else - { - if ((!it->walking) && (it->generation < it->wd->generation)) - { - if (!it->relcount) - { - it->del_cb(it); - elm_widget_item_free(it); - } - } - else - it->wd->last_selected_item = (Elm_Object_Item *) it; - } -} - -static Evas_Object * -_item_content_get_hook(Elm_Gen_Item *it, const char *part) -{ - return edje_object_part_swallow_get(VIEW(it), part); -} - -static void -_item_content_set_hook(Elm_Gen_Item *it, const char *part, Evas_Object *content) -{ - edje_object_part_swallow(VIEW(it), part, content); -} - -static Evas_Object * -_item_content_unset_hook(Elm_Gen_Item *it, const char *part) -{ - Evas_Object *obj; - - obj = edje_object_part_swallow_get(VIEW(it), part); - if (!obj) return NULL; - edje_object_part_unswallow(VIEW(it), obj); - return obj; -} - -static const char * -_item_text_hook(Elm_Gen_Item *it, const char *part) -{ - if (!it->itc->func.text_get) return NULL; - return edje_object_part_text_get(VIEW(it), part); -} - -Elm_Gen_Item * -_elm_gengrid_item_new(Widget_Data *wd, - const Elm_Gen_Item_Class *itc, - const void *data, - Elm_Gen_Item *parent, - Evas_Smart_Cb func, - const void *func_data) -{ - Elm_Gen_Item *it; - - it = elm_widget_item_new(wd->obj, Elm_Gen_Item); - if (!it) return NULL; - it->wd = wd; - it->generation = wd->generation; - it->itc = itc; - it->base.data = data; - it->parent = parent; - it->func.func = func; - it->func.data = func_data; - elm_widget_item_content_get_hook_set(it, _item_content_get_hook); - elm_widget_item_content_set_hook_set(it, _item_content_set_hook); - elm_widget_item_content_unset_hook_set(it, _item_content_unset_hook); - //elm_widget_item_disable_hook_set(it, _item_disable_hook); - //elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook); - /* TEMPORARY */ - it->sel_cb = (Ecore_Cb)_item_select; - - elm_widget_item_text_get_hook_set(it, _item_text_hook); - return it; -} -#endif - -======= ->>>>>>> remotes/origin/upstream static Elm_Gen_Item * _item_new(Widget_Data *wd, const Elm_Gengrid_Item_Class *itc, @@ -2186,18 +1912,6 @@ _item_new(Widget_Data *wd, { Elm_Gen_Item *it; -<<<<<<< HEAD -#if 0 - it = _elm_genlist_item_new(wd, itc, data, NULL, func, func_data); -#else - it = _elm_gengrid_item_new(wd, itc, data, NULL, func, func_data); -#endif - if (!it) return NULL; - elm_widget_item_disable_hook_set(it, _item_disable_hook); - elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook); - it->item = ELM_NEW(Elm_Gen_Item_Type); - wd->count++; -======= it = _elm_genlist_item_new(wd, itc, data, NULL, func, func_data); if (!it) return NULL; elm_widget_item_disable_hook_set(it, _item_disable_hook); @@ -2205,7 +1919,6 @@ _item_new(Widget_Data *wd, elm_gengrid_item_class_ref((Elm_Gengrid_Item_Class *)itc); it->item = ELM_NEW(Elm_Gen_Item_Type); wd->item_count++; ->>>>>>> remotes/origin/upstream it->group = it->itc->item_style && (!strcmp(it->itc->item_style, "group_index")); ELM_GEN_ITEM_SETUP(it); @@ -2260,11 +1973,7 @@ elm_gengrid_add(Evas_Object *parent) elm_smart_scroller_object_theme_set(obj, wd->scr, "gengrid", "base", "default"); elm_smart_scroller_bounce_allow_set(wd->scr, bounce, -<<<<<<< HEAD - _elm_config->thumbscroll_bounce_enable); -======= _elm_config->thumbscroll_bounce_enable); ->>>>>>> remotes/origin/upstream elm_widget_resize_object_set(obj, wd->scr); evas_object_smart_callback_add(wd->scr, "animate,start", _scr_anim_start, obj); @@ -2409,11 +2118,8 @@ elm_gengrid_item_append(Evas_Object *obj, it = _item_new(wd, itc, data, func, func_data); if (!it) return NULL; wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it)); -<<<<<<< HEAD -======= it->position = eina_inlist_count(wd->items); it->position_update = EINA_TRUE; ->>>>>>> remotes/origin/upstream if (it->group) wd->group_items = eina_list_prepend(wd->group_items, it); @@ -2421,11 +2127,7 @@ elm_gengrid_item_append(Evas_Object *obj, if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -2443,22 +2145,15 @@ elm_gengrid_item_prepend(Evas_Object *obj, it = _item_new(wd, itc, data, func, func_data); if (!it) return NULL; wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(it)); -<<<<<<< HEAD -======= _item_position_update(wd->items, 0); ->>>>>>> remotes/origin/upstream if (it->group) wd->group_items = eina_list_append(wd->group_items, it); if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -2479,23 +2174,16 @@ elm_gengrid_item_insert_before(Evas_Object *obj, if (!it) return NULL; wd->items = eina_inlist_prepend_relative (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET((Elm_Gen_Item *) relative)); -<<<<<<< HEAD -======= Eina_Inlist *tmp = eina_inlist_find(wd->items, EINA_INLIST_GET(it)); _item_position_update(tmp, ((Elm_Gen_Item *)relative)->position); ->>>>>>> remotes/origin/upstream if (it->group) wd->group_items = eina_list_append_relative(wd->group_items, it, ((Elm_Gen_Item *) relative)->parent); if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -2516,30 +2204,15 @@ elm_gengrid_item_insert_after(Evas_Object *obj, if (!it) return NULL; wd->items = eina_inlist_append_relative (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET((Elm_Gen_Item *) relative)); -<<<<<<< HEAD -======= Eina_Inlist *tmp = eina_inlist_find(wd->items, EINA_INLIST_GET(it)); _item_position_update(tmp, ((Elm_Gen_Item *)relative)->position+1); ->>>>>>> remotes/origin/upstream if (it->group) wd->group_items = eina_list_prepend_relative(wd->group_items, it, ((Elm_Gen_Item *) relative)->parent); if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -} - -EAPI Elm_Object_Item * -elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, - const Elm_Gengrid_Item_Class *itc, - const void *data, - Eina_Compare_Cb comp, - Evas_Smart_Cb func, - const void *func_data) -======= return (Elm_Object_Item *)it; } @@ -2550,7 +2223,6 @@ elm_gengrid_item_sorted_insert(Evas_Object *obj, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data) ->>>>>>> remotes/origin/upstream { Elm_Gen_Item *it; ELM_CHECK_WIDTYPE(obj, widtype) NULL; @@ -2566,26 +2238,6 @@ elm_gengrid_item_sorted_insert(Evas_Object *obj, wd->item_compare_cb = comp; wd->items = eina_inlist_sorted_state_insert(wd->items, EINA_INLIST_GET(it), _elm_gengrid_item_compare, wd->state); -<<<<<<< HEAD - if (wd->calc_job) ecore_job_del(wd->calc_job); - wd->calc_job = ecore_job_add(_calc_job, wd); - - return (Elm_Object_Item *) it; -} - -EAPI Elm_Object_Item * -elm_gengrid_item_sorted_insert(Evas_Object *obj, - const Elm_Gengrid_Item_Class *itc, - const void *data, - Eina_Compare_Cb comp, - Evas_Smart_Cb func, - const void *func_data) -{ - Widget_Data *wd = elm_widget_data_get(obj); - wd->item_compare_data_cb = comp; - - return elm_gengrid_item_direct_sorted_insert(obj, itc, data, _elm_gengrid_item_compare_data, func, func_data); -======= _item_position_update(wd->items, 0); if (wd->calc_job) ecore_job_del(wd->calc_job); @@ -2603,7 +2255,6 @@ elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, const void *func_data) { return elm_gengrid_item_sorted_insert(obj, itc, data, comp, func, func_data); ->>>>>>> remotes/origin/upstream } EAPI void @@ -2614,23 +2265,14 @@ elm_gengrid_item_del(Elm_Object_Item *it) EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, -<<<<<<< HEAD - Eina_Bool setting) -======= Eina_Bool horizontal) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - if (setting == wd->horizontal) return; - wd->horizontal = setting; -======= horizontal = !!horizontal; if (horizontal == wd->horizontal) return; wd->horizontal = horizontal; ->>>>>>> remotes/origin/upstream /* Update the items to conform to the new layout */ if (wd->calc_job) ecore_job_del(wd->calc_job); @@ -2646,86 +2288,6 @@ elm_gengrid_horizontal_get(const Evas_Object *obj) return wd->horizontal; } -<<<<<<< HEAD -#if 1 -static void -_elm_gengrid_clear(Evas_Object *obj, Eina_Bool standby) -{ - Eina_Inlist *next, *l; - - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - if (!standby) wd->generation++; - - if (wd->state) - { - eina_inlist_sorted_state_free(wd->state); - wd->state = NULL; - } - - if (wd->walking > 0) - { - wd->clear_me = 1; - return; - } - evas_event_freeze(evas_object_evas_get(wd->obj)); - for (l = wd->items, next = l ? l->next : NULL; - l; - l = next, next = next ? next->next : NULL) - { - Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(l); - - if (it->generation < wd->generation) - { - Elm_Gen_Item *itn = NULL; - - if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next); - if (itn) itn->walking++; /* prevent early death of subitem */ - it->del_cb(it); - elm_widget_item_free(it); - if (itn) itn->walking--; - } - } - wd->clear_me = 0; - wd->pan_changed = EINA_TRUE; - if (wd->calc_job) - { - ecore_job_del(wd->calc_job); - wd->calc_job = NULL; - } - if (wd->selected) wd->selected = eina_list_free(wd->selected); - if (wd->clear_cb) wd->clear_cb(wd); - wd->pan_x = 0; - wd->pan_y = 0; - wd->minw = 0; - wd->minh = 0; - wd->count = 0; - if (wd->pan_smart) - { - evas_object_size_hint_min_set(wd->pan_smart, wd->minw, wd->minh); - evas_object_smart_callback_call(wd->pan_smart, "changed", NULL); - } - if (wd->sizing_cb) wd->sizing_cb(wd->obj); - elm_smart_scroller_child_region_show(wd->scr, 0, 0, 0, 0); - evas_event_thaw(evas_object_evas_get(wd->obj)); - evas_event_thaw_eval(evas_object_evas_get(wd->obj)); -} -#endif - -EAPI void -elm_gengrid_clear(Evas_Object *obj) -{ -#if 0 - elm_genlist_clear(obj); -#else - _elm_gengrid_clear(obj, EINA_FALSE); -#endif -} - -EAPI const Evas_Object * -======= EAPI void elm_gengrid_clear(Evas_Object *obj) { @@ -2733,7 +2295,6 @@ elm_gengrid_clear(Evas_Object *obj) } EINA_DEPRECATED EAPI const Evas_Object * ->>>>>>> remotes/origin/upstream elm_gengrid_item_object_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); @@ -2744,17 +2305,10 @@ EAPI void elm_gengrid_item_update(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; - if (!_it->realized) return; - if (_it->want_unrealize) return; - _elm_gengrid_item_unrealize(_it, EINA_FALSE); -======= Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (!_it->realized) return; if (_it->want_unrealize) return; _elm_genlist_item_unrealize(_it, EINA_FALSE); ->>>>>>> remotes/origin/upstream _item_realize(_it); _item_place(_it, _it->x, _it->y); } @@ -2775,21 +2329,6 @@ elm_gengrid_item_data_set(Elm_Object_Item *it, EAPI const Elm_Gengrid_Item_Class * elm_gengrid_item_item_class_get(const Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; - if (_it->generation < _it->wd->generation) return NULL; - return _it->itc; -} - -EAPI void -elm_gengrid_item_item_class_set(Elm_Object_Item *it, - const Elm_Gengrid_Item_Class *itc) -{ - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - EINA_SAFETY_ON_NULL_RETURN(itc); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; -======= return (Elm_Gengrid_Item_Class *) elm_genlist_item_item_class_get(it); } @@ -2807,7 +2346,6 @@ elm_gengrid_item_item_class_update(Elm_Object_Item *it, ELM_OBJ_ITEM_CHECK_OR_RETURN(it); EINA_SAFETY_ON_NULL_RETURN(itc); Elm_Gen_Item *_it = (Elm_Gen_Item *)it; ->>>>>>> remotes/origin/upstream if (_it->generation < _it->wd->generation) return; _it->itc = itc; elm_gengrid_item_update(it); @@ -2819,13 +2357,8 @@ elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *y) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - if (x) *x = ((Elm_Gen_Item *) it)->x; - if (y) *y = ((Elm_Gen_Item *) it)->y; -======= if (x) *x = ((Elm_Gen_Item *)it)->x; if (y) *y = ((Elm_Gen_Item *)it)->y; ->>>>>>> remotes/origin/upstream } EAPI void @@ -2835,11 +2368,7 @@ elm_gengrid_multi_select_set(Evas_Object *obj, ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - wd->multi = multi; -======= wd->multi = !!multi; ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool @@ -2864,66 +2393,19 @@ elm_gengrid_selected_item_get(const Evas_Object *obj) EAPI const Eina_List * elm_gengrid_selected_items_get(const Evas_Object *obj) { -<<<<<<< HEAD - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->selected; -======= return elm_genlist_selected_items_get(obj); ->>>>>>> remotes/origin/upstream } EAPI void elm_gengrid_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { -<<<<<<< HEAD -#if 0 elm_genlist_item_selected_set(it, selected); -#else - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; - Widget_Data *wd = _it->wd; - if (!wd) return; - if ((_it->generation < wd->generation) || elm_widget_item_disabled_get(_it)) - return; - selected = !!selected; - if (_it->selected == selected) return; - - if (selected) - { - if (!wd->multi) - { - while (wd->selected) - { - if (_it->unhighlight_cb) _it->unhighlight_cb(wd->selected->data); - _it->unsel_cb(wd->selected->data); - } - } - _it->highlight_cb(_it); - _item_select(_it); - return; - } - if (_it->unhighlight_cb) _it->unhighlight_cb(_it); - _it->unsel_cb(_it); -#endif -======= - elm_genlist_item_selected_set(it, selected); ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Object_Item *it) { -<<<<<<< HEAD -#if 0 - return elm_genlist_item_selected_get(it); -#else - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - return ((Elm_Gen_Item *) it)->selected; -#endif -======= return elm_genlist_item_selected_get(it); } @@ -2953,7 +2435,6 @@ elm_gengrid_realized_items_update(Evas_Object *obj) list = elm_gengrid_realized_items_get(obj); EINA_LIST_FOREACH(list, l, it) elm_gengrid_item_update(it); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3009,11 +2490,7 @@ elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb) { ELM_OBJ_ITEM_CHECK_OR_GOTO(it, error); -<<<<<<< HEAD - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; -======= Elm_Gen_Item *_it = (Elm_Gen_Item *)it; ->>>>>>> remotes/origin/upstream if ((_it->tooltip.content_cb == func) && (_it->tooltip.data == data)) return; @@ -3042,11 +2519,7 @@ EAPI void elm_gengrid_item_tooltip_unset(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; -======= Elm_Gen_Item *_it = (Elm_Gen_Item *)it; ->>>>>>> remotes/origin/upstream if ((VIEW(_it)) && (_it->tooltip.content_cb)) elm_widget_item_tooltip_unset(_it); @@ -3066,11 +2539,7 @@ elm_gengrid_item_tooltip_style_set(Elm_Object_Item *it, const char *style) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - eina_stringshare_replace(&((Elm_Gen_Item *) it)->tooltip.style, style); -======= eina_stringshare_replace(&((Elm_Gen_Item *)it)->tooltip.style, style); ->>>>>>> remotes/origin/upstream if (VIEW(it)) elm_widget_item_tooltip_style_set(it, style); } @@ -3078,22 +2547,14 @@ EAPI const char * elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -<<<<<<< HEAD - return ((Elm_Gen_Item *) it)->tooltip.style; -======= return ((Elm_Gen_Item *)it)->tooltip.style; ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); -<<<<<<< HEAD - ((Elm_Gen_Item *) it)->tooltip.free_size = disable; -======= ((Elm_Gen_Item *)it)->tooltip.free_size = disable; ->>>>>>> remotes/origin/upstream if (VIEW(it)) return elm_widget_item_tooltip_window_mode_set(it, disable); return EINA_TRUE; } @@ -3102,11 +2563,7 @@ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); -<<<<<<< HEAD - return ((Elm_Gen_Item *) it)->tooltip.free_size; -======= return ((Elm_Gen_Item *)it)->tooltip.free_size; ->>>>>>> remotes/origin/upstream } EAPI void @@ -3114,21 +2571,13 @@ elm_gengrid_item_cursor_set(Elm_Object_Item *it, const char *cursor) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - eina_stringshare_replace(&((Elm_Gen_Item *) it)->mouse_cursor, cursor); -======= eina_stringshare_replace(&((Elm_Gen_Item *)it)->mouse_cursor, cursor); ->>>>>>> remotes/origin/upstream if (VIEW(it)) elm_widget_item_cursor_set(it, cursor); } EAPI const char * elm_gengrid_item_cursor_get(const Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -======= ->>>>>>> remotes/origin/upstream return elm_widget_item_cursor_get(it); } @@ -3136,11 +2585,7 @@ EAPI void elm_gengrid_item_cursor_unset(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; -======= Elm_Gen_Item *_it = (Elm_Gen_Item *)it; ->>>>>>> remotes/origin/upstream if (!_it->mouse_cursor) return; @@ -3155,20 +2600,12 @@ EAPI void elm_gengrid_item_cursor_style_set(Elm_Object_Item *it, const char *style) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -======= ->>>>>>> remotes/origin/upstream elm_widget_item_cursor_style_set(it, style); } EAPI const char * elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -======= ->>>>>>> remotes/origin/upstream return elm_widget_item_cursor_style_get(it); } @@ -3176,20 +2613,12 @@ EAPI void elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -======= ->>>>>>> remotes/origin/upstream elm_widget_item_cursor_engine_only_set(it, engine_only); } EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); -======= ->>>>>>> remotes/origin/upstream return elm_widget_item_cursor_engine_only_get(it); } @@ -3200,11 +2629,7 @@ elm_gengrid_reorder_mode_set(Evas_Object *obj, ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - wd->reorder_mode = reorder_mode; -======= wd->reorder_mode = !!reorder_mode; ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool @@ -3216,60 +2641,6 @@ elm_gengrid_reorder_mode_get(const Evas_Object *obj) return wd->reorder_mode; } -<<<<<<< HEAD -EAPI void -elm_gengrid_always_select_mode_set(Evas_Object *obj, - Eina_Bool always_select) -{ -#if 0 - elm_genlist_always_select_mode_set(obj, always_select); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - wd->always_select = always_select; -#endif -} - -EAPI Eina_Bool -elm_gengrid_always_select_mode_get(const Evas_Object *obj) -{ -#if 0 - return elm_genlist_always_select_mode_get(obj); -#else - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - return wd->always_select; -#endif -} - -EAPI void -elm_gengrid_no_select_mode_set(Evas_Object *obj, - Eina_Bool no_select) -{ -#if 0 - elm_genlist_no_select_mode_set(obj, no_select); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - wd->no_select = no_select; -#endif -} - -EAPI Eina_Bool -elm_gengrid_no_select_mode_get(const Evas_Object *obj) -{ -#if 0 - return elm_genlist_no_select_mode_get(obj); -#else - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - return wd->no_select; -#endif -======= EINA_DEPRECATED EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) @@ -3316,7 +2687,6 @@ elm_gengrid_no_select_mode_get(const Evas_Object *obj) return EINA_TRUE; else return EINA_FALSE; ->>>>>>> remotes/origin/upstream } EAPI void @@ -3324,20 +2694,7 @@ elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) { -<<<<<<< HEAD -#if 0 - elm_genlist_bounce_set(obj, h_bounce, v_bounce); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce); - wd->h_bounce = h_bounce; - wd->v_bounce = v_bounce; -#endif -======= elm_genlist_bounce_set(obj, h_bounce, v_bounce); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3345,19 +2702,7 @@ elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) { -<<<<<<< HEAD -#if 0 - elm_genlist_bounce_get(obj, h_bounce, v_bounce); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (h_bounce) *h_bounce = wd->h_bounce; - if (v_bounce) *v_bounce = wd->v_bounce; -#endif -======= elm_genlist_bounce_get(obj, h_bounce, v_bounce); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3365,42 +2710,13 @@ elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel) { -<<<<<<< HEAD -#if 0 _elm_genlist_page_relative_set(obj, h_pagerel, v_pagerel); -#else - Evas_Coord pagesize_h; - Evas_Coord pagesize_v; - - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - elm_smart_scroller_paging_get(wd->scr, NULL, NULL, &pagesize_h, &pagesize_v); - elm_smart_scroller_paging_set(wd->scr, h_pagerel, v_pagerel, pagesize_h, - pagesize_v); -#endif -======= - _elm_genlist_page_relative_set(obj, h_pagerel, v_pagerel); ->>>>>>> remotes/origin/upstream } EAPI void elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel) { -<<<<<<< HEAD -#if 0 _elm_genlist_page_relative_get(obj, h_pagerel, v_pagerel); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - elm_smart_scroller_paging_get(wd->scr, h_pagerel, v_pagerel, NULL, NULL); -#endif -======= - _elm_genlist_page_relative_get(obj, h_pagerel, v_pagerel); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3408,93 +2724,30 @@ elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize) { -<<<<<<< HEAD -#if 0 _elm_genlist_page_size_set(obj, h_pagesize, v_pagesize); -#else - double pagerel_h; - double pagerel_v; - - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_smart_scroller_paging_get(wd->scr, &pagerel_h, &pagerel_v, NULL, NULL); - elm_smart_scroller_paging_set(wd->scr, pagerel_h, pagerel_v, h_pagesize, - v_pagesize); -#endif -======= - _elm_genlist_page_size_set(obj, h_pagesize, v_pagesize); ->>>>>>> remotes/origin/upstream } EAPI void elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) { -<<<<<<< HEAD -#if 0 _elm_genlist_current_page_get(obj, h_pagenumber, v_pagenumber); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->scr) - elm_smart_scroller_current_page_get(wd->scr, h_pagenumber, v_pagenumber); -#endif -======= - _elm_genlist_current_page_get(obj, h_pagenumber, v_pagenumber); ->>>>>>> remotes/origin/upstream } EAPI void elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) { -<<<<<<< HEAD -#if 0 - _elm_genlist_last_page_get(obj, h_pagenumber, v_pagenumber); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->scr) - elm_smart_scroller_last_page_get(wd->scr, h_pagenumber, v_pagenumber); -#endif -======= _elm_genlist_last_page_get(obj, h_pagenumber, v_pagenumber); ->>>>>>> remotes/origin/upstream } EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) { -<<<<<<< HEAD -#if 0 - _elm_genlist_page_show(obj, h_pagenumber, v_pagenumber); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->scr) - elm_smart_scroller_page_show(wd->scr, h_pagenumber, v_pagenumber); -#endif -======= _elm_genlist_page_show(obj, h_pagenumber, v_pagenumber); ->>>>>>> remotes/origin/upstream } EAPI void elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) { -<<<<<<< HEAD -#if 0 - _elm_genlist_page_bring_in(obj, h_pagenumber, v_pagenumber); -#else - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->scr) - elm_smart_scroller_page_bring_in(wd->scr, h_pagenumber, v_pagenumber); -#endif -======= _elm_genlist_page_bring_in(obj, h_pagenumber, v_pagenumber); } @@ -3524,91 +2777,30 @@ elm_gengrid_scroller_policy_get(const Evas_Object *obj, elm_smart_scroller_policy_get(wd->scr, &s_policy_h, &s_policy_v); if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h; if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * elm_gengrid_first_item_get(const Evas_Object *obj) { -<<<<<<< HEAD -#if 0 - return elm_genlist_first_item_get(obj); -#else - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - if (!wd->items) return NULL; - Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items); - while ((it) && (it->generation < wd->generation)) - it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); - return (Elm_Object_Item *) it; -#endif -======= return elm_genlist_first_item_get(obj); ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * elm_gengrid_last_item_get(const Evas_Object *obj) { -<<<<<<< HEAD -#if 0 return elm_genlist_last_item_get(obj); -#else - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - if (!wd->items) return NULL; - Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items->last); - while ((it) && (it->generation < wd->generation)) - it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev); - return (Elm_Object_Item *) it; -#endif -======= - return elm_genlist_last_item_get(obj); ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * elm_gengrid_item_next_get(const Elm_Object_Item *it) { -<<<<<<< HEAD -#if 0 - return elm_genlist_item_next_get(it); -#else - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; - while (_it) - { - _it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(_it)->next); - if ((_it) && (_it->generation == _it->wd->generation)) break; - } - return (Elm_Object_Item *) _it; -#endif -======= return elm_genlist_item_next_get(it); ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * elm_gengrid_item_prev_get(const Elm_Object_Item *it) { -<<<<<<< HEAD -#if 0 - return elm_genlist_item_prev_get(it); -#else - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; - while (_it) - { - _it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(_it)->prev); - if ((_it) && (_it->generation == _it->wd->generation)) break; - } - return (Elm_Object_Item *) _it; -#endif -======= return elm_genlist_item_prev_get(it); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -3618,31 +2810,21 @@ elm_gengrid_item_gengrid_get(const Elm_Object_Item *it) } EAPI void -<<<<<<< HEAD -elm_gengrid_item_show(Elm_Object_Item *it) -{ - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; -======= elm_gengrid_item_show(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type type) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); Elm_Gen_Item *_it = (Elm_Gen_Item *)it; ->>>>>>> remotes/origin/upstream Widget_Data *wd = _it->wd; Evas_Coord minx = 0, miny = 0; if ((_it->generation < _it->wd->generation)) return; _pan_min_get(wd->pan_smart, &minx, &miny); -<<<<<<< HEAD -======= if (type==ELM_GENGRID_ITEM_SCROLLTO_IN) { //TODO : type based handling like genlist } ->>>>>>> remotes/origin/upstream if (wd->horizontal) elm_smart_scroller_region_bring_in(_it->wd->scr, ((_it->x - _it->item->prev_group) * wd->item_width) + (_it->item->prev_group * _it->wd->group_item_width) + minx, @@ -3658,17 +2840,10 @@ elm_gengrid_item_show(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type type) } EAPI void -<<<<<<< HEAD -elm_gengrid_item_bring_in(Elm_Object_Item *it) -{ - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; -======= elm_gengrid_item_bring_in(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type type) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); Elm_Gen_Item *_it = (Elm_Gen_Item *)it; ->>>>>>> remotes/origin/upstream if (_it->generation < _it->wd->generation) return; @@ -3676,14 +2851,11 @@ elm_gengrid_item_bring_in(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type ty Widget_Data *wd = _it->wd; _pan_min_get(wd->pan_smart, &minx, &miny); -<<<<<<< HEAD -======= if (type==ELM_GENGRID_ITEM_SCROLLTO_IN) { //TODO : type based handling like genlist } ->>>>>>> remotes/origin/upstream if (wd->horizontal) elm_smart_scroller_region_bring_in(_it->wd->scr, ((_it->x - _it->item->prev_group) * wd->item_width) + (_it->item->prev_group * _it->wd->group_item_width) + minx, @@ -3718,81 +2890,6 @@ elm_gengrid_filled_get(const Evas_Object *obj) return wd->filled; } -<<<<<<< HEAD -#if 1 -void -_elm_gengrid_item_unrealize(Elm_Gen_Item *it, - Eina_Bool calc) -{ - Evas_Object *content; - - if (!it->realized) return; - if (it->wd->reorder_it == it) return; - evas_event_freeze(evas_object_evas_get(WIDGET(it))); - if (!calc) - evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, it); - if (it->long_timer) - { - ecore_timer_del(it->long_timer); - it->long_timer = NULL; - } - - elm_widget_stringlist_free(it->texts); - it->texts = NULL; - elm_widget_stringlist_free(it->contents); - it->contents = NULL; - elm_widget_stringlist_free(it->states); - it->states = NULL; - - EINA_LIST_FREE(it->content_objs, content) - evas_object_del(content); - - it->unrealize_cb(it); - - it->realized = EINA_FALSE; - it->want_unrealize = EINA_FALSE; - evas_event_thaw(evas_object_evas_get(WIDGET(it))); - evas_event_thaw_eval(evas_object_evas_get(WIDGET(it))); -} - -void -_elm_gengrid_item_del_notserious(Elm_Gen_Item *it) -{ - elm_widget_item_pre_notify_del(it); - it->generation = it->wd->generation - 1; /* This means that the item is deleted */ - if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it); - - if (it->itc->func.del) - it->itc->func.del((void *)it->base.data, WIDGET(it)); -} - -void -_elm_gengrid_item_del_serious(Elm_Gen_Item *it) -{ - _elm_gengrid_item_del_notserious(it); - it->wd->items = eina_inlist_remove(it->wd->items, EINA_INLIST_GET(it)); - if (it->tooltip.del_cb) - it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it); - it->wd->walking -= it->walking; - if (it->long_timer) ecore_timer_del(it->long_timer); - if (it->group) - it->wd->group_items = eina_list_remove(it->wd->group_items, it); - - if (it->wd->state) - { - eina_inlist_sorted_state_free(it->wd->state); - it->wd->state = NULL; - } - if (it->wd->calc_job) ecore_job_del(it->wd->calc_job); - it->wd->calc_job = ecore_job_add(it->wd->calc_cb, it->wd); - free(it->item); - - it->item = NULL; - if (it->wd->last_selected_item == (Elm_Object_Item *) it) - it->wd->last_selected_item = NULL; -} -#endif -======= EAPI unsigned int elm_gengrid_items_count(const Evas_Object *obj) { @@ -3886,4 +2983,3 @@ elm_gengrid_item_index_get(const Elm_Object_Item *it) return _it->position; } ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_gengrid.h b/src/lib/elm_gengrid.h index 62b6300..7299530 100644 --- a/src/lib/elm_gengrid.h +++ b/src/lib/elm_gengrid.h @@ -1,8 +1,3 @@ -<<<<<<< HEAD -// XXX: elm_gengrid - make sure api's match 1:1 with genlist api's -// for eventual move to back-end of gengrid == genlist (in grid mode) -======= ->>>>>>> remotes/origin/upstream /** * @defgroup Gengrid Gengrid (Generic grid) * @@ -96,15 +91,9 @@ * of the state parts in the Edje group implementing the item's * theme. Return @c EINA_FALSE for false/off or @c EINA_TRUE for * true/on. Gengrids will emit a signal to its theming Edje object -<<<<<<< HEAD - * with @c "elm,state,XXX,active" and @c "elm" as "emission" and - * "source" arguments, respectively, when the state is true (the - * default is false), where @c XXX is the name of the (state) part. -======= * with @c "elm,state,xxx,active" and @c "elm" as "emission" and * "source" arguments, respectively, when the state is true (the * default is false), where @c xxx is the name of the (state) part. ->>>>>>> remotes/origin/upstream * See #Elm_Gengrid_Item_State_Get_Cb. * - @c func.del - This is called when elm_object_item_del() is * called on an item or elm_gengrid_clear() is called on the @@ -140,14 +129,9 @@ * Grid cells will only have their selection smart callbacks called * when firstly getting selected. Any further clicks will do * nothing, unless you enable the "always select mode", with -<<<<<<< HEAD - * elm_gengrid_always_select_mode_set(), thus making every click to - * issue selection callbacks. elm_gengrid_no_select_mode_set() will -======= * elm_gengrid_select_mode_set() as ELM_OBJECT_SELECT_MODE_ALWAYS, * thus making every click to issue selection callbacks. * elm_gengrid_select_mode_set() as ELM_OBJECT_SELECT_MODE_NONE will ->>>>>>> remotes/origin/upstream * turn off the ability to select items entirely in the widget and * they will neither appear selected nor call the selection smart * callbacks. @@ -237,64 +221,6 @@ * @{ */ -<<<<<<< HEAD -typedef struct _Elm_Gengrid_Item_Class Elm_Gengrid_Item_Class; /**< Gengrid item class definition structs */ -#define Elm_Gengrid_Item_Class Elm_Gen_Item_Class -typedef struct _Elm_Gengrid_Item_Class_Func Elm_Gengrid_Item_Class_Func; /**< Class functions for gengrid item classes. */ - -/** - * Text fetching class function for Elm_Gen_Item_Class. - * @param data The data passed in the item creation function - * @param obj The base widget object - * @param part The part name of the swallow - * @return The allocated (NOT stringshared) string to set as the text - */ -typedef char *(*Elm_Gengrid_Item_Text_Get_Cb)(void *data, Evas_Object *obj, const char *part); - -/** - * Content (swallowed object) fetching class function for Elm_Gen_Item_Class. - * @param data The data passed in the item creation function - * @param obj The base widget object - * @param part The part name of the swallow - * @return The content object to swallow - */ -typedef Evas_Object *(*Elm_Gengrid_Item_Content_Get_Cb)(void *data, Evas_Object *obj, const char *part); - -/** - * State fetching class function for Elm_Gen_Item_Class. - * @param data The data passed in the item creation function - * @param obj The base widget object - * @param part The part name of the swallow - * @return The hell if I know - */ -typedef Eina_Bool (*Elm_Gengrid_Item_State_Get_Cb)(void *data, Evas_Object *obj, const char *part); - -/** - * Deletion class function for Elm_Gen_Item_Class. - * @param data The data passed in the item creation function - * @param obj The base widget object - */ -typedef void (*Elm_Gengrid_Item_Del_Cb)(void *data, Evas_Object *obj); - -/** - * @struct _Elm_Gengrid_Item_Class - * - * Gengrid item class definition. See @ref Gengrid_Item_Class for - * field details. - */ -struct _Elm_Gengrid_Item_Class -{ - const char *item_style; - struct _Elm_Gengrid_Item_Class_Func - { - Elm_Gengrid_Item_Text_Get_Cb text_get; /**< Text fetching class function for gengrid item classes.*/ - Elm_Gengrid_Item_Content_Get_Cb content_get; /**< Content fetching class function for gengrid item classes. */ - Elm_Gengrid_Item_State_Get_Cb state_get; /**< State fetching class function for gengrid item classes. */ - Elm_Gengrid_Item_Del_Cb del; /**< Deletion class function for gengrid item classes. */ - } func; -}; /**< #Elm_Gengrid_Item_Class member definitions */ -#define Elm_Gengrid_Item_Class_Func Elm_Gen_Item_Class_Func -======= #define ELM_GENGRID_ITEM_CLASS_VERSION ELM_GEN_ITEM_CLASS_VERSION #define ELM_GENGRID_ITEM_CLASS_HEADER ELM_GEN_ITEM_CLASS_HEADER @@ -336,7 +262,6 @@ typedef Elm_Gen_Item_State_Get_Cb Elm_Gengrid_Item_State_Get_Cb; * @see Elm_Gen_Item_Del_Cb */ typedef Elm_Gen_Item_Del_Cb Elm_Gengrid_Item_Del_Cb; ->>>>>>> remotes/origin/upstream /** * Add a new gengrid widget to the given parent Elementary @@ -359,155 +284,6 @@ typedef Elm_Gen_Item_Del_Cb Elm_Gengrid_Item_Del_Cb; EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent); /** -<<<<<<< HEAD - * Set the size for the items of a given gengrid widget - * - * @param obj The gengrid object. - * @param w The items' width. - * @param h The items' height; - * - * A gengrid, after creation, has still no information on the size - * to give to each of its cells. So, you most probably will end up - * with squares one @ref Fingers "finger" wide, the default - * size. Use this function to force a custom size for you items, - * making them as big as you wish. - * - * @see elm_gengrid_item_size_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); - -/** - * Get the size set for the items of a given gengrid widget - * - * @param obj The gengrid object. - * @param w Pointer to a variable where to store the items' width. - * @param h Pointer to a variable where to store the items' height. - * - * @note Use @c NULL pointers on the size values you're not - * interested in: they'll be ignored by the function. - * - * @see elm_gengrid_item_size_get() for more details - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); - -/** - * Set the size for the group items of a given gengrid widget - * - * @param obj The gengrid object. - * @param w The group items' width. - * @param h The group items' height; - * - * A gengrid, after creation, has still no information on the size - * to give to each of its cells. So, you most probably will end up - * with squares one @ref Fingers "finger" wide, the default - * size. Use this function to force a custom size for you group items, - * making them as big as you wish. - * - * @see elm_gengrid_group_item_size_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_group_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); - -/** - * Get the size set for the group items of a given gengrid widget - * - * @param obj The gengrid object. - * @param w Pointer to a variable where to store the group items' width. - * @param h Pointer to a variable where to store the group items' height. - * - * @note Use @c NULL pointers on the size values you're not - * interested in: they'll be ignored by the function. - * - * @see elm_gengrid_group_item_size_get() for more details - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_group_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); - -/** - * Set the items grid's alignment within a given gengrid widget - * - * @param obj The gengrid object. - * @param align_x Alignment in the horizontal axis (0 <= align_x <= 1). - * @param align_y Alignment in the vertical axis (0 <= align_y <= 1). - * - * This sets the alignment of the whole grid of items of a gengrid - * within its given viewport. By default, those values are both - * 0.5, meaning that the gengrid will have its items grid placed - * exactly in the middle of its viewport. - * - * @note If given alignment values are out of the cited ranges, - * they'll be changed to the nearest boundary values on the valid - * ranges. - * - * @see elm_gengrid_align_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_align_set(Evas_Object *obj, double align_x, double align_y); - -/** - * Get the items grid's alignment values within a given gengrid - * widget - * - * @param obj The gengrid object. - * @param align_x Pointer to a variable where to store the - * horizontal alignment. - * @param align_y Pointer to a variable where to store the vertical - * alignment. - * - * @note Use @c NULL pointers on the alignment values you're not - * interested in: they'll be ignored by the function. - * - * @see elm_gengrid_align_set() for more details - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_align_get(const Evas_Object *obj, double *align_x, double *align_y); - -/** - * Set whether a given gengrid widget is or not able have items - * @b reordered - * - * @param obj The gengrid object - * @param reorder_mode Use @c EINA_TRUE to turn reoderding on, - * @c EINA_FALSE to turn it off - * - * If a gengrid is set to allow reordering, a click held for more - * than 0.5 over a given item will highlight it specially, - * signalling the gengrid has entered the reordering state. From - * that time on, the user will be able to, while still holding the - * mouse button down, move the item freely in the gengrid's - * viewport, replacing to said item to the locations it goes to. - * The replacements will be animated and, whenever the user - * releases the mouse button, the item being replaced gets a new - * definitive place in the grid. - * - * @see elm_gengrid_reorder_mode_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode); - -/** - * Get whether a given gengrid widget is or not able have items - * @b reordered - * - * @param obj The gengrid object - * @return @c EINA_TRUE, if reoderding is on, @c EINA_FALSE if it's - * off - * - * @see elm_gengrid_reorder_mode_set() for more details - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_reorder_mode_get(const Evas_Object *obj); -======= * Remove all items from a given gengrid widget * * @param obj The gengrid object. @@ -531,820 +307,222 @@ EAPI void elm_gengrid_clear(Evas_Object *obj); * Multi-selection is the ability to have @b more than one * item selected, on a given gengrid, simultaneously. When it is * enabled, a sequence of clicks on different items will make them - * all selected, progressively. A click on an already selected item - * will unselect it. If interacting via the keyboard, - * multi-selection is enabled while holding the "Shift" key. - * - * @note By default, multi-selection is @b disabled on gengrids - * - * @see elm_gengrid_multi_select_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi); - -/** - * Get whether multi-selection is enabled or disabled for a given - * gengrid widget - * - * @param obj The gengrid object. - * @return @c EINA_TRUE, if multi-selection is enabled, @c - * EINA_FALSE otherwise - * - * @see elm_gengrid_multi_select_set() for more details - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_multi_select_get(const Evas_Object *obj); - -/** - * Set the direction in which a given gengrid widget will expand while - * placing its items. - * - * @param obj The gengrid object. - * @param horizontal @c EINA_TRUE to make the gengrid expand - * horizontally, @c EINA_FALSE to expand vertically. - * - * When in "horizontal mode" (@c EINA_TRUE), items will be placed - * in @b columns, from top to bottom and, when the space for a - * column is filled, another one is started on the right, thus - * expanding the grid horizontally. When in "vertical mode" - * (@c EINA_FALSE), though, items will be placed in @b rows, from left - * to right and, when the space for a row is filled, another one is - * started below, thus expanding the grid vertically. - * - * @see elm_gengrid_horizontal_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool horizontal); - -/** - * Get for what direction a given gengrid widget will expand while - * placing its items. - * - * @param obj The gengrid object. - * @return @c EINA_TRUE, if @p obj is set to expand horizontally, - * @c EINA_FALSE if it's set to expand vertically. - * - * @see elm_gengrid_horizontal_set() for more details - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_horizontal_get(const Evas_Object *obj); - -/** - * Enable or disable bouncing effect for a given gengrid widget - * - * @param obj The gengrid object - * @param h_bounce @c EINA_TRUE, to enable @b horizontal bouncing, - * @c EINA_FALSE to disable it - * @param v_bounce @c EINA_TRUE, to enable @b vertical bouncing, - * @c EINA_FALSE to disable it - * - * The bouncing effect occurs whenever one reaches the gengrid's - * edge's while panning it -- it will scroll past its limits a - * little bit and return to the edge again, in a animated for, - * automatically. - * - * @note By default, gengrids have bouncing enabled on both axis - * - * @see elm_gengrid_bounce_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); - -/** - * Get whether bouncing effects are enabled or disabled, for a - * given gengrid widget, on each axis - * - * @param obj The gengrid object - * @param h_bounce Pointer to a variable where to store the - * horizontal bouncing flag. - * @param v_bounce Pointer to a variable where to store the - * vertical bouncing flag. - * - * @see elm_gengrid_bounce_set() for more details - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); ->>>>>>> remotes/origin/upstream - -/** - * Append a new item in a given gengrid widget. - * - * @param obj The gengrid object. - * @param gic The item class for the item. - * @param data The item data. - * @param func Convenience function called when the item is - * selected. - * @param func_data Data to be passed to @p func. - * @return A handle to the item added or @c NULL, on errors. - * - * This adds an item to the beginning of the gengrid. - * - * @see elm_gengrid_item_prepend() - * @see elm_gengrid_item_insert_before() - * @see elm_gengrid_item_insert_after() - * @see elm_object_item_del() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data); - -/** - * Prepend a new item in a given gengrid widget. - * - * @param obj The gengrid object. - * @param gic The item class for the item. - * @param data The item data. - * @param func Convenience function called when the item is - * selected. - * @param func_data Data to be passed to @p func. - * @return A handle to the item added or @c NULL, on errors. - * - * This adds an item to the end of the gengrid. - * - * @see elm_gengrid_item_append() - * @see elm_gengrid_item_insert_before() - * @see elm_gengrid_item_insert_after() - * @see elm_object_item_del() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_prepend(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data); - -/** - * Insert an item before another in a gengrid widget - * - * @param obj The gengrid object. - * @param gic The item class for the item. - * @param data The item data. - * @param relative The item to place this new one before. - * @param func Convenience function called when the item is - * selected. - * @param func_data Data to be passed to @p func. - * @return A handle to the item added or @c NULL, on errors. - * - * This inserts an item before another in the gengrid. - * - * @see elm_gengrid_item_append() - * @see elm_gengrid_item_prepend() - * @see elm_gengrid_item_insert_after() - * @see elm_object_item_del() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_insert_before(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data); - -/** - * Insert an item after another in a gengrid widget - * - * @param obj The gengrid object. - * @param gic The item class for the item. - * @param data The item data. - * @param relative The item to place this new one after. - * @param func Convenience function called when the item is - * selected. - * @param func_data Data to be passed to @p func. - * @return A handle to the item added or @c NULL, on errors. - * - * This inserts an item after another in the gengrid. - * - * @see elm_gengrid_item_append() - * @see elm_gengrid_item_prepend() - * @see elm_gengrid_item_insert_after() - * @see elm_object_item_del() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_insert_after(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data); - -/** - * Insert an item in a gengrid widget using a user-defined sort function. - * - * @param obj The gengrid object. - * @param gic The item class for the item. - * @param data The item data. - * @param comp User defined comparison function that defines the sort order - * based on Elm_Gen_Item and its data param. - * @param func Convenience function called when the item is selected. - * @param func_data Data to be passed to @p func. - * @return A handle to the item added or @c NULL, on errors. - * -<<<<<<< HEAD - * This inserts an item in the gengrid based on user defined comparison function. -======= - * This inserts an item in the gengrid based on user defined comparison - * function. The two arguments passed to the function @p func are gengrid - * item handles to compare. ->>>>>>> remotes/origin/upstream - * - * @see elm_gengrid_item_append() - * @see elm_gengrid_item_prepend() - * @see elm_gengrid_item_insert_after() - * @see elm_object_item_del() -<<<<<<< HEAD - * @see elm_gengrid_item_direct_sorted_insert() -======= ->>>>>>> remotes/origin/upstream - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data); - -/** -<<<<<<< HEAD - * Insert an item in a gengrid widget using a user-defined sort function. - * - * @param obj The gengrid object. - * @param gic The item class for the item. - * @param data The item data. - * @param comp User defined comparison function that defines the sort order - * based on Elm_Gen_Item. - * @param func Convenience function called when the item is selected. - * @param func_data Data to be passed to @p func. - * @return A handle to the item added or @c NULL, on errors. - * - * This inserts an item in the gengrid based on user defined comparison function. - * - * @see elm_gengrid_item_append() - * @see elm_gengrid_item_prepend() - * @see elm_gengrid_item_insert_after() - * @see elm_object_item_del() - * @see elm_gengrid_item_sorted_insert() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data); - -/** - * Set whether items on a given gengrid widget are to get their - * selection callbacks issued for @b every subsequent selection - * click on them or just for the first click. - * - * @param obj The gengrid object - * @param always_select @c EINA_TRUE to make items "always - * selected", @c EINA_FALSE, otherwise - * - * By default, grid items will only call their selection callback - * function when firstly getting selected, any subsequent further - * clicks will do nothing. With this call, you make those - * subsequent clicks also to issue the selection callbacks. - * - * @note Double clicks will @b always be reported on items. - * - * @see elm_gengrid_always_select_mode_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); - -/** - * Get whether items on a given gengrid widget have their selection - * callbacks issued for @b every subsequent selection click on them - * or just for the first click. - * - * @param obj The gengrid object. - * @return @c EINA_TRUE if the gengrid items are "always selected", - * @c EINA_FALSE, otherwise - * - * @see elm_gengrid_always_select_mode_set() for more details - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj); - -/** - * Set whether items on a given gengrid widget can be selected or not. - * - * @param obj The gengrid object - * @param no_select @c EINA_TRUE to make items selectable, - * @c EINA_FALSE otherwise - * - * This will make items in @p obj selectable or not. In the latter - * case, any user interaction on the gengrid items will neither make - * them appear selected nor them call their selection callback - * functions. - * - * @see elm_gengrid_no_select_mode_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select); - -/** - * Get whether items on a given gengrid widget can be selected or - * not. - * - * @param obj The gengrid object - * @return @c EINA_TRUE, if items are selectable, @c EINA_FALSE - * otherwise - * - * @see elm_gengrid_no_select_mode_set() for more details - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_no_select_mode_get(const Evas_Object *obj); - -/** - * Enable or disable multi-selection in a given gengrid widget - * - * @param obj The gengrid object. - * @param multi @c EINA_TRUE, to enable multi-selection, - * @c EINA_FALSE to disable it. - * - * Multi-selection is the ability to have @b more than one - * item selected, on a given gengrid, simultaneously. When it is - * enabled, a sequence of clicks on different items will make them - * all selected, progressively. A click on an already selected item - * will unselect it. If interacting via the keyboard, - * multi-selection is enabled while holding the "Shift" key. - * - * @note By default, multi-selection is @b disabled on gengrids - * - * @see elm_gengrid_multi_select_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi); - -/** - * Get whether multi-selection is enabled or disabled for a given - * gengrid widget - * - * @param obj The gengrid object. - * @return @c EINA_TRUE, if multi-selection is enabled, @c - * EINA_FALSE otherwise - * - * @see elm_gengrid_multi_select_set() for more details - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_multi_select_get(const Evas_Object *obj); - -/** - * Enable or disable bouncing effect for a given gengrid widget - * - * @param obj The gengrid object - * @param h_bounce @c EINA_TRUE, to enable @b horizontal bouncing, - * @c EINA_FALSE to disable it - * @param v_bounce @c EINA_TRUE, to enable @b vertical bouncing, - * @c EINA_FALSE to disable it - * - * The bouncing effect occurs whenever one reaches the gengrid's - * edge's while panning it -- it will scroll past its limits a - * little bit and return to the edge again, in a animated for, - * automatically. - * - * @note By default, gengrids have bouncing enabled on both axis - * - * @see elm_gengrid_bounce_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); - -/** - * Get whether bouncing effects are enabled or disabled, for a - * given gengrid widget, on each axis - * - * @param obj The gengrid object - * @param h_bounce Pointer to a variable where to store the - * horizontal bouncing flag. - * @param v_bounce Pointer to a variable where to store the - * vertical bouncing flag. - * - * @see elm_gengrid_bounce_set() for more details - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); - -/** - * Set a given gengrid widget's scrolling page size, relative to - * its viewport size. - * - * @param obj The gengrid object - * @param h_pagerel The horizontal page (relative) size - * @param v_pagerel The vertical page (relative) size - * - * The gengrid's scroller is capable of binding scrolling by the - * user to "pages". It means that, while scrolling and, specially - * after releasing the mouse button, the grid will @b snap to the - * nearest displaying page's area. When page sizes are set, the - * grid's continuous content area is split into (equal) page sized - * pieces. - * - * This function sets the size of a page relatively to the - * viewport dimensions of the gengrid, for each axis. A value - * @c 1.0 means "the exact viewport's size", in that axis, while @c - * 0.0 turns paging off in that axis. Likewise, @c 0.5 means "half - * a viewport". Sane usable values are, than, between @c 0.0 and @c - * 1.0. Values beyond those will make it behave behave - * inconsistently. If you only want one axis to snap to pages, use - * the value @c 0.0 for the other one. - * - * There is a function setting page size values in @b absolute - * values, too -- elm_gengrid_page_size_set(). Naturally, its use - * is mutually exclusive to this one. - * - * @see elm_gengrid_page_relative_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel); - -/** - * Get a given gengrid widget's scrolling page size, relative to - * its viewport size. - * - * @param obj The gengrid object - * @param h_pagerel Pointer to a variable where to store the - * horizontal page (relative) size - * @param v_pagerel Pointer to a variable where to store the - * vertical page (relative) size - * - * @see elm_gengrid_page_relative_set() for more details - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel); - -/** - * Set a given gengrid widget's scrolling page size - * - * @param obj The gengrid object - * @param h_pagerel The horizontal page size, in pixels - * @param v_pagerel The vertical page size, in pixels - * - * The gengrid's scroller is capable of binding scrolling by the - * user to "pages". It means that, while scrolling and, specially - * after releasing the mouse button, the grid will @b snap to the - * nearest displaying page's area. When page sizes are set, the - * grid's continuous content area is split into (equal) page sized - * pieces. - * - * This function sets the size of a page of the gengrid, in pixels, - * for each axis. Sane usable values are, between @c 0 and the - * dimensions of @p obj, for each axis. Values beyond those will - * make it behave behave inconsistently. If you only want one axis - * to snap to pages, use the value @c 0 for the other one. - * - * There is a function setting page size values in @b relative - * values, too -- elm_gengrid_page_relative_set(). Naturally, its - * use is mutually exclusive to this one. - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize); - -/** - * @brief Get gengrid current page number. - * - * @param obj The gengrid object - * @param h_pagenumber The horizontal page number - * @param v_pagenumber The vertical page number - * - * The page number starts from 0. 0 is the first page. - * Current page means the page which meet the top-left of the viewport. - * If there are two or more pages in the viewport, it returns the number of page - * which meet the top-left of the viewport. - * - * @see elm_gengrid_last_page_get() - * @see elm_gengrid_page_show() - * @see elm_gengrid_page_brint_in() - */ -EAPI void elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber); - -/** - * @brief Get scroll last page number. - * - * @param obj The gengrid object - * @param h_pagenumber The horizontal page number - * @param v_pagenumber The vertical page number - * - * The page number starts from 0. 0 is the first page. - * This returns the last page number among the pages. - * - * @see elm_gengrid_current_page_get() - * @see elm_gengrid_page_show() - * @see elm_gengrid_page_brint_in() - */ -EAPI void elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber); - -/** - * Show a specific virtual region within the gengrid content object by page number. - * - * @param obj The gengrid object - * @param h_pagenumber The horizontal page number - * @param v_pagenumber The vertical page number - * - * 0, 0 of the indicated page is located at the top-left of the viewport. - * This will jump to the page directly without animation. - * - * Example of usage: - * - * @code - * sc = elm_gengrid_add(win); - * elm_gengrid_content_set(sc, content); - * elm_gengrid_page_relative_set(sc, 1, 0); - * elm_gengrid_current_page_get(sc, &h_page, &v_page); - * elm_gengrid_page_show(sc, h_page + 1, v_page); - * @endcode - * - * @see elm_gengrid_page_bring_in() - */ -EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber); - -/** - * Show a specific virtual region within the gengrid content object by page number. - * - * @param obj The gengrid object - * @param h_pagenumber The horizontal page number - * @param v_pagenumber The vertical page number - * - * 0, 0 of the indicated page is located at the top-left of the viewport. - * This will slide to the page with animation. - * - * Example of usage: - * - * @code - * sc = elm_gengrid_add(win); - * elm_gengrid_content_set(sc, content); - * elm_gengrid_page_relative_set(sc, 1, 0); - * elm_gengrid_last_page_get(sc, &h_page, &v_page); - * elm_gengrid_page_bring_in(sc, h_page, v_page); - * @endcode - * - * @see elm_gengrid_page_show() - */ -EAPI void elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber); - -/** - * Set the direction in which a given gengrid widget will expand while - * placing its items. - * - * @param obj The gengrid object. - * @param setting @c EINA_TRUE to make the gengrid expand - * horizontally, @c EINA_FALSE to expand vertically. - * - * When in "horizontal mode" (@c EINA_TRUE), items will be placed - * in @b columns, from top to bottom and, when the space for a - * column is filled, another one is started on the right, thus - * expanding the grid horizontally. When in "vertical mode" - * (@c EINA_FALSE), though, items will be placed in @b rows, from left - * to right and, when the space for a row is filled, another one is - * started below, thus expanding the grid vertically. - * - * @see elm_gengrid_horizontal_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool setting); - -/** - * Get for what direction a given gengrid widget will expand while - * placing its items. - * - * @param obj The gengrid object. - * @return @c EINA_TRUE, if @p obj is set to expand horizontally, - * @c EINA_FALSE if it's set to expand vertically. - * - * @see elm_gengrid_horizontal_set() for more detais - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_horizontal_get(const Evas_Object *obj); - -/** - * Get the first item in a given gengrid widget - * - * @param obj The gengrid object - * @return The first item's handle or @c NULL, if there are no - * items in @p obj (and on errors) - * - * This returns the first item in the @p obj's internal list of - * items. - * - * @see elm_gengrid_last_item_get() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_first_item_get(const Evas_Object *obj); - -/** - * Get the last item in a given gengrid widget - * - * @param obj The gengrid object - * @return The last item's handle or @c NULL, if there are no - * items in @p obj (and on errors) - * - * This returns the last item in the @p obj's internal list of - * items. - * - * @see elm_gengrid_first_item_get() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_last_item_get(const Evas_Object *obj); - -/** - * Get the @b next item in a gengrid widget's internal list of items, - * given a handle to one of those items. - * - * @param it The gengrid item to fetch next from - * @return The item after @p item, or @c NULL if there's none (and - * on errors) - * - * This returns the item placed after the @p item, on the container - * gengrid. - * - * @see elm_gengrid_item_prev_get() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_next_get(const Elm_Object_Item *it); - -/** - * Get the @b previous item in a gengrid widget's internal list of items, - * given a handle to one of those items. - * - * @param it The gengrid item to fetch previous from - * @return The item before @p item, or @c NULL if there's none (and - * on errors) + * all selected, progressively. A click on an already selected item + * will unselect it. If interacting via the keyboard, + * multi-selection is enabled while holding the "Shift" key. * - * This returns the item placed before the @p item, on the container - * gengrid. + * @note By default, multi-selection is @b disabled on gengrids * - * @see elm_gengrid_item_next_get() + * @see elm_gengrid_multi_select_get() * * @ingroup Gengrid */ -EAPI Elm_Object_Item *elm_gengrid_item_prev_get(const Elm_Object_Item *it); +EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi); /** - * Update the contents of a given gengrid item + * Get whether multi-selection is enabled or disabled for a given + * gengrid widget * - * @param it The gengrid item + * @param obj The gengrid object. + * @return @c EINA_TRUE, if multi-selection is enabled, @c + * EINA_FALSE otherwise * - * This updates an item by calling all the item class functions - * again to get the contents, texts and states. Use this when the - * original item data has changed and you want the changes to be - * reflected. + * @see elm_gengrid_multi_select_set() for more details * * @ingroup Gengrid */ -EAPI void elm_gengrid_item_update(Elm_Object_Item *it); +EAPI Eina_Bool elm_gengrid_multi_select_get(const Evas_Object *obj); /** - * Get the Gengrid Item class for the given Gengrid Item. + * Set the direction in which a given gengrid widget will expand while + * placing its items. * - * @param it The gengrid item + * @param obj The gengrid object. + * @param horizontal @c EINA_TRUE to make the gengrid expand + * horizontally, @c EINA_FALSE to expand vertically. * - * This returns the Gengrid_Item_Class for the given item. It can be used to examine - * the function pointers and item_style. + * When in "horizontal mode" (@c EINA_TRUE), items will be placed + * in @b columns, from top to bottom and, when the space for a + * column is filled, another one is started on the right, thus + * expanding the grid horizontally. When in "vertical mode" + * (@c EINA_FALSE), though, items will be placed in @b rows, from left + * to right and, when the space for a row is filled, another one is + * started below, thus expanding the grid vertically. + * + * @see elm_gengrid_horizontal_get() * * @ingroup Gengrid */ -EAPI const Elm_Gengrid_Item_Class *elm_gengrid_item_item_class_get(const Elm_Object_Item *it); +EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool horizontal); /** - * Get the Gengrid Item class for the given Gengrid Item. + * Get for what direction a given gengrid widget will expand while + * placing its items. * - * This sets the Gengrid_Item_Class for the given item. It can be used to examine - * the function pointers and item_style. + * @param obj The gengrid object. + * @return @c EINA_TRUE, if @p obj is set to expand horizontally, + * @c EINA_FALSE if it's set to expand vertically. * - * @param it The gengrid item - * @param gic The gengrid item class describing the function pointers and the item style. + * @see elm_gengrid_horizontal_set() for more details * * @ingroup Gengrid */ -EAPI void elm_gengrid_item_item_class_set(Elm_Object_Item *it, const Elm_Gengrid_Item_Class *gic); +EAPI Eina_Bool elm_gengrid_horizontal_get(const Evas_Object *obj); /** - * Get a given gengrid item's position, relative to the whole - * gengrid's grid area. + * Enable or disable bouncing effect for a given gengrid widget * - * @param it The Gengrid item. - * @param x Pointer to variable to store the item's row number. - * @param y Pointer to variable to store the item's column number. + * @param obj The gengrid object + * @param h_bounce @c EINA_TRUE, to enable @b horizontal bouncing, + * @c EINA_FALSE to disable it + * @param v_bounce @c EINA_TRUE, to enable @b vertical bouncing, + * @c EINA_FALSE to disable it * - * This returns the "logical" position of the item within the - * gengrid. For example, @c (0, 1) would stand for first row, - * second column. + * The bouncing effect occurs whenever one reaches the gengrid's + * edge's while panning it -- it will scroll past its limits a + * little bit and return to the edge again, in a animated for, + * automatically. + * + * @note By default, gengrids have bouncing enabled on both axis + * + * @see elm_gengrid_bounce_get() * * @ingroup Gengrid */ -EAPI void elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *x, unsigned int *y); +EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); /** - * Set whether a given gengrid item is selected or not - * - * @param it The gengrid item - * @param selected Use @c EINA_TRUE, to make it selected, @c - * EINA_FALSE to make it unselected + * Get whether bouncing effects are enabled or disabled, for a + * given gengrid widget, on each axis * - * This sets the selected state of an item. If multi-selection is - * not enabled on the containing gengrid and @p selected is @c - * EINA_TRUE, any other previously selected items will get - * unselected in favor of this new one. + * @param obj The gengrid object + * @param h_bounce Pointer to a variable where to store the + * horizontal bouncing flag. + * @param v_bounce Pointer to a variable where to store the + * vertical bouncing flag. * - * @see elm_gengrid_item_selected_get() + * @see elm_gengrid_bounce_set() for more details * * @ingroup Gengrid */ -EAPI void elm_gengrid_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); +EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); /** - * Get whether a given gengrid item is selected or not + * Append a new item in a given gengrid widget. * - * @param it The gengrid item - * @return @c EINA_TRUE, if it's selected, @c EINA_FALSE otherwise + * @param obj The gengrid object. + * @param gic The item class for the item. + * @param data The item data. + * @param func Convenience function called when the item is + * selected. + * @param func_data Data to be passed to @p func. + * @return A handle to the item added or @c NULL, on errors. * - * This API returns EINA_TRUE for all the items selected in multi-select mode as well. + * This adds an item to the beginning of the gengrid. * - * @see elm_gengrid_item_selected_set() for more details + * @see elm_gengrid_item_prepend() + * @see elm_gengrid_item_insert_before() + * @see elm_gengrid_item_insert_after() + * @see elm_object_item_del() * * @ingroup Gengrid */ -EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Object_Item *it); +EAPI Elm_Object_Item *elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data); /** - * Get the real Evas object created to implement the view of a - * given gengrid item + * Prepend a new item in a given gengrid widget. * - * @param it The gengrid item. - * @return the Evas object implementing this item's view. + * @param obj The gengrid object. + * @param gic The item class for the item. + * @param data The item data. + * @param func Convenience function called when the item is + * selected. + * @param func_data Data to be passed to @p func. + * @return A handle to the item added or @c NULL, on errors. * - * This returns the actual Evas object used to implement the - * specified gengrid item's view. This may be @c NULL, as it may - * not have been created or may have been deleted, at any time, by - * the gengrid. Do not modify this object (move, resize, - * show, hide, etc.), as the gengrid is controlling it. This - * function is for querying, emitting custom signals or hooking - * lower level callbacks for events on that object. Do not delete - * this object under any circumstances. + * This adds an item to the end of the gengrid. * - * @see elm_object_item_data_get() + * @see elm_gengrid_item_append() + * @see elm_gengrid_item_insert_before() + * @see elm_gengrid_item_insert_after() + * @see elm_object_item_del() * * @ingroup Gengrid */ -EAPI const Evas_Object *elm_gengrid_item_object_get(const Elm_Object_Item *it); +EAPI Elm_Object_Item *elm_gengrid_item_prepend(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data); /** - * Show the portion of a gengrid's internal grid containing a given - * item, @b immediately. + * Insert an item before another in a gengrid widget * - * @param it The item to display + * @param obj The gengrid object. + * @param gic The item class for the item. + * @param data The item data. + * @param relative The item to place this new one before. + * @param func Convenience function called when the item is + * selected. + * @param func_data Data to be passed to @p func. + * @return A handle to the item added or @c NULL, on errors. * - * This causes gengrid to @b redraw its viewport's contents to the - * region contining the given @p item item, if it is not fully - * visible. + * This inserts an item before another in the gengrid. * - * @see elm_gengrid_item_bring_in() + * @see elm_gengrid_item_append() + * @see elm_gengrid_item_prepend() + * @see elm_gengrid_item_insert_after() + * @see elm_object_item_del() * * @ingroup Gengrid */ -EAPI void elm_gengrid_item_show(Elm_Object_Item *it); +EAPI Elm_Object_Item *elm_gengrid_item_insert_before(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data); /** - * Animatedly bring in, to the visible area of a gengrid, a given - * item on it. + * Insert an item after another in a gengrid widget * - * @param it The gengrid item to display + * @param obj The gengrid object. + * @param gic The item class for the item. + * @param data The item data. + * @param relative The item to place this new one after. + * @param func Convenience function called when the item is + * selected. + * @param func_data Data to be passed to @p func. + * @return A handle to the item added or @c NULL, on errors. * - * This causes gengrid to jump to the given @p item and show - * it (by scrolling), if it is not fully visible. This will use - * animation to do so and take a period of time to complete. + * This inserts an item after another in the gengrid. * - * @see elm_gengrid_item_show() + * @see elm_gengrid_item_append() + * @see elm_gengrid_item_prepend() + * @see elm_gengrid_item_insert_after() + * @see elm_object_item_del() * * @ingroup Gengrid */ -EAPI void elm_gengrid_item_bring_in(Elm_Object_Item *it); +EAPI Elm_Object_Item *elm_gengrid_item_insert_after(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data); /** - * Set the text to be shown in a given gengrid item's tooltips. + * Insert an item in a gengrid widget using a user-defined sort function. * - * @param it The gengrid item - * @param text The text to set in the content + * @param obj The gengrid object. + * @param gic The item class for the item. + * @param data The item data. + * @param comp User defined comparison function that defines the sort order + * based on Elm_Gen_Item and its data param. + * @param func Convenience function called when the item is selected. + * @param func_data Data to be passed to @p func. + * @return A handle to the item added or @c NULL, on errors. * - * This call will setup the text to be used as tooltip to that item - * (analogous to elm_object_tooltip_text_set(), but being item - * tooltips with higher precedence than object tooltips). It can - * have only one tooltip at a time, so any previous tooltip data - * will get removed. + * This inserts an item in the gengrid based on user defined comparison + * function. The two arguments passed to the function @p func are gengrid + * item handles to compare. + * + * @see elm_gengrid_item_append() + * @see elm_gengrid_item_prepend() + * @see elm_gengrid_item_insert_after() + * @see elm_object_item_del() * * @ingroup Gengrid */ -EAPI void elm_gengrid_item_tooltip_text_set(Elm_Object_Item *it, const char *text); +EAPI Elm_Object_Item *elm_gengrid_item_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data); /** - * Set the content to be shown in a given gengrid item's tooltip -======= * Get the selected item in a given gengrid widget * * @param obj The gengrid object. @@ -1727,7 +905,6 @@ EAPI void elm_gengrid_item_tooltip_text_set(Elm_Object_ /** * Set the content to be shown in a given gengrid item's tooltip ->>>>>>> remotes/origin/upstream * * @param it The gengrid item. * @param func The function returning the tooltip contents. @@ -1747,12 +924,9 @@ EAPI void elm_gengrid_item_tooltip_text_set(Elm_Object_ * return a valid Evas object, which will be fully managed by the * tooltip system, getting deleted when the tooltip is gone. * -<<<<<<< HEAD -======= * In order to set just a text as a tooltip, look at * elm_gengrid_item_tooltip_text_set(). * ->>>>>>> remotes/origin/upstream * @ingroup Gengrid */ EAPI void elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); @@ -1817,11 +991,7 @@ EAPI const char *elm_gengrid_item_tooltip_style_get(const Elm_ * @param disable If EINA_TRUE, size restrictions are disabled * @return EINA_FALSE on failure, EINA_TRUE on success * -<<<<<<< HEAD - * This function allows a tooltip to expand beyond its parant window's canvas. -======= * This function allows a tooltip to expand beyond its parent window's canvas. ->>>>>>> remotes/origin/upstream * It will instead be limited only by the size of the display. */ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable); @@ -1832,11 +1002,7 @@ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_set(Elm_ * @return If EINA_TRUE, size restrictions are disabled * * This function returns whether a tooltip is allowed to expand beyond -<<<<<<< HEAD - * its parant window's canvas. -======= * its parent window's canvas. ->>>>>>> remotes/origin/upstream * It will instead be limited only by the size of the display. */ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it); @@ -1974,55 +1140,6 @@ EAPI void elm_gengrid_item_cursor_engine_only_set(Elm_O EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it); /** -<<<<<<< HEAD - * Remove all items from a given gengrid widget - * - * @param obj The gengrid object. - * - * This removes (and deletes) all items in @p obj, leaving it - * empty. - * - * @see elm_object_item_del(), to remove just one item. - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_clear(Evas_Object *obj); - -/** - * Get the selected item in a given gengrid widget - * - * @param obj The gengrid object. - * @return The selected item's handleor @c NULL, if none is - * selected at the moment (and on errors) - * - * This returns the selected item in @p obj. If multi selection is - * enabled on @p obj (@see elm_gengrid_multi_select_set()), only - * the first item in the list is selected, which might not be very - * useful. For that case, see elm_gengrid_selected_items_get(). - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_selected_item_get(const Evas_Object *obj); - -/** - * Get a list of selected items in a given gengrid - * - * @param obj The gengrid object. - * @return The list of selected items or @c NULL, if none is - * selected at the moment (and on errors) - * - * This returns a list of the selected items, in the order that - * they appear in the grid. This list is only valid as long as no - * more items are selected or unselected (or unselected implictly - * by deletion). The list contains #Gengrid item pointers as - * data, naturally. - * - * @see elm_gengrid_selected_item_get() - * - * @ingroup Gengrid - */ -EAPI const Eina_List *elm_gengrid_selected_items_get(const Evas_Object *obj); -======= * Set the size for the items of a given gengrid widget * * @param obj The gengrid object. @@ -2347,7 +1464,6 @@ EAPI void elm_gengrid_page_bring_in(const Evas_Object * * @ingroup Gengrid */ EAPI void elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *x, unsigned int *y); ->>>>>>> remotes/origin/upstream /** * Set how the items grid's filled within a given gengrid widget @@ -2356,14 +1472,6 @@ EAPI void elm_gengrid_item_pos_get(const Elm_Object_Ite * @param fill Filled if True * * This sets the fill state of the whole grid of items of a gengrid -<<<<<<< HEAD - * within its given viewport. By default, this value is False, meaning - * that if the first line of items grid's aren't filled - * - * Set how the items grid's filled within a given gengrid widget. - * This sets the fill state of the whole grid of items of a gengrid -======= ->>>>>>> remotes/origin/upstream * within its given viewport. By default, this value is false, meaning * that if the first line of items grid's isn't filled, the items are * centered with the alignment @@ -2371,17 +1479,10 @@ EAPI void elm_gengrid_item_pos_get(const Elm_Object_Ite * @see elm_gengrid_filled_get() * * @ingroup Gengrid -<<<<<<< HEAD - */ -EAPI void elm_gengrid_filled_set(Evas_Object *obj, Eina_Bool fill); - - -======= * */ EAPI void elm_gengrid_filled_set(Evas_Object *obj, Eina_Bool fill); ->>>>>>> remotes/origin/upstream /** * Get how the items grid's filled within a given gengrid widget * @@ -2399,8 +1500,6 @@ EAPI void elm_gengrid_filled_set(Evas_Object *obj, Eina EAPI Eina_Bool elm_gengrid_filled_get(const Evas_Object *obj); /** -<<<<<<< HEAD -======= * Set the gengrid select mode. * * @param obj The gengrid object @@ -2470,6 +1569,5 @@ EAPI void elm_gengrid_highlight_mode_set(Evas_Object *o EAPI Eina_Bool elm_gengrid_highlight_mode_get(const Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * @} */ diff --git a/src/lib/elm_getting_started.h b/src/lib/elm_getting_started.h index 785fb9d..9bea82f 100644 --- a/src/lib/elm_getting_started.h +++ b/src/lib/elm_getting_started.h @@ -66,11 +66,7 @@ * ./autogen.sh * @endverbatim * -<<<<<<< HEAD - * This will generate Makefile.in's, the confgure script and everything else. -======= * This will generate Makefile.in's, the configure script and everything else. ->>>>>>> remotes/origin/upstream * After this it works like all normal autotools projects: * @verbatim * ./configure @@ -83,11 +79,7 @@ * specify a different prefix with configure: * * @verbatim -<<<<<<< HEAD - * ./confiugre --prefix=$HOME/mysoftware -======= * ./configure --prefix=$HOME/mysoftware ->>>>>>> remotes/origin/upstream * @endverbatim * * Also remember that autotools buys you some useful commands like: @@ -165,11 +157,7 @@ * // add a box object - default is vertical. a box holds children in a row, * // either horizontally or vertically. nothing more. * box = elm_box_add(win); -<<<<<<< HEAD - * // make the box hotizontal -======= * // make the box horizontal ->>>>>>> remotes/origin/upstream * elm_box_horizontal_set(box, EINA_TRUE); * // add object as a resize object for the window (controls window minimum * // size as well as gets resized if window is resized) diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c index 00f2a89..22f1b23 100644 --- a/src/lib/elm_grid.c +++ b/src/lib/elm_grid.c @@ -51,11 +51,7 @@ _elm_grid_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_ dir, next); if (list_free) -<<<<<<< HEAD - list_free((Eina_List *)items); -======= list_free((Eina_List *)items); ->>>>>>> remotes/origin/upstream return ret; } @@ -83,13 +79,7 @@ elm_grid_add(Evas_Object *parent) Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); -<<<<<<< HEAD - - ELM_SET_WIDTYPE(widtype, "grid"); - wd->obj = obj; -======= ELM_SET_WIDTYPE(widtype, "grid"); ->>>>>>> remotes/origin/upstream elm_widget_type_set(obj, "grid"); elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); @@ -107,11 +97,7 @@ elm_grid_add(Evas_Object *parent) } EAPI void -<<<<<<< HEAD -elm_grid_size_set(Evas_Object *obj, int w, int h) -======= elm_grid_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -120,11 +106,7 @@ elm_grid_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) } EAPI void -<<<<<<< HEAD -elm_grid_size_get(Evas_Object *obj, int *w, int *h) -======= elm_grid_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -133,11 +115,7 @@ elm_grid_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) } EAPI void -<<<<<<< HEAD -elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h) -======= elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -170,11 +148,7 @@ elm_grid_clear(Evas_Object *obj, Eina_Bool clear) } EAPI void -<<<<<<< HEAD -elm_grid_pack_set(Evas_Object *subobj, int x, int y, int w, int h) -======= elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) ->>>>>>> remotes/origin/upstream { Evas_Object *obj = elm_widget_parent_widget_get(subobj); ELM_CHECK_WIDTYPE(obj, widtype); @@ -192,8 +166,6 @@ elm_grid_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h) if (!wd) return; evas_object_grid_pack_get(wd->grd, subobj, x, y, w, h); } -<<<<<<< HEAD -======= EAPI Eina_List * elm_grid_children_get(const Evas_Object *obj) @@ -203,4 +175,3 @@ elm_grid_children_get(const Evas_Object *obj) if (!wd) return NULL; return evas_object_grid_children_get(wd->grd); } ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_grid.h b/src/lib/elm_grid.h index be150cf..d458ec3 100644 --- a/src/lib/elm_grid.h +++ b/src/lib/elm_grid.h @@ -32,11 +32,7 @@ EAPI Evas_Object *elm_grid_add(Evas_Object *parent); * * @ingroup Grid */ -<<<<<<< HEAD -EAPI void elm_grid_size_set(Evas_Object *obj, int w, int h); -======= EAPI void elm_grid_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); ->>>>>>> remotes/origin/upstream /** * Get the virtual size of the grid @@ -47,11 +43,7 @@ EAPI void elm_grid_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h * * @ingroup Grid */ -<<<<<<< HEAD -EAPI void elm_grid_size_get(Evas_Object *obj, int *w, int *h); -======= EAPI void elm_grid_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); ->>>>>>> remotes/origin/upstream /** * Pack child at given position and size @@ -65,11 +57,7 @@ EAPI void elm_grid_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_ * * @ingroup Grid */ -<<<<<<< HEAD -EAPI void elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h); -======= EAPI void elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); ->>>>>>> remotes/origin/upstream /** * Unpack a child from a grid object @@ -102,17 +90,10 @@ EAPI void elm_grid_clear(Evas_Object *obj, Eina_Bool clear); * * @ingroup Grid */ -<<<<<<< HEAD -EAPI void elm_grid_pack_set(Evas_Object *subobj, int x, int y, int w, int h); - -/** - * get packing of a child -======= EAPI void elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); /** * Get packing of a child ->>>>>>> remotes/origin/upstream * * @param subobj The child to query * @param x Pointer to integer to store the virtual x coord @@ -122,9 +103,6 @@ EAPI void elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coor * * @ingroup Grid */ -<<<<<<< HEAD -EAPI void elm_grid_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h); -======= EAPI void elm_grid_pack_get(Evas_Object *subobj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); /** @@ -140,7 +118,6 @@ EAPI void elm_grid_pack_get(Evas_Object *subobj, Evas_Coord *x, Evas_Coo * @ingroup Grid */ EAPI Eina_List *elm_grid_children_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * @} diff --git a/src/lib/elm_intro.h b/src/lib/elm_intro.h index 828ac96..59758fe 100644 --- a/src/lib/elm_intro.h +++ b/src/lib/elm_intro.h @@ -2,11 +2,7 @@ * @mainpage Elementary * @image html elementary.png * @version 0.8.0 -<<<<<<< HEAD - * @date 2008-2011 -======= * @date 2008-2012 ->>>>>>> remotes/origin/upstream * * @section intro What is Elementary? * @@ -20,11 +16,7 @@ * * @section organization Organization * -<<<<<<< HEAD - * One can divide Elemementary into three main groups: -======= * One can divide Elementary into three main groups: ->>>>>>> remotes/origin/upstream * @li @ref infralist - These are modules that deal with Elementary as a whole. * @li @ref widgetslist - These are the widgets you'll compose your UI out of. * @li @ref containerslist - These are the containers which hold the widgets. @@ -38,9 +30,5 @@ * There is a lot that goes into making a widget set, and they don't happen out of * nothing. It's like trying to make everyone everywhere happy, regardless of age, * gender, race or nationality - and that is really tough. So thanks to people and -<<<<<<< HEAD - * organisations behind this, as listed in the @ref authors page. -======= * organizations behind this, as listed in the @ref authors page. ->>>>>>> remotes/origin/upstream */ diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c index 7d76b78..602bbf2 100644 --- a/src/lib/elm_mapbuf.c +++ b/src/lib/elm_mapbuf.c @@ -161,11 +161,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) if (content) { evas_object_data_set(content, "_elm_leaveme", (void *)1); -<<<<<<< HEAD - elm_widget_sub_object_add(content, obj); -======= elm_widget_sub_object_add(obj, content); ->>>>>>> remotes/origin/upstream evas_object_smart_member_add(content, obj); evas_object_clip_set(content, wd->clip); evas_object_color_set(wd->clip, 255, 255, 255, 255); diff --git a/src/lib/elm_mapbuf.h b/src/lib/elm_mapbuf.h index a824ac0..91422bf 100644 --- a/src/lib/elm_mapbuf.h +++ b/src/lib/elm_mapbuf.h @@ -8,19 +8,11 @@ * This holds one content object and uses an Evas Map of transformation * points to be later used with this content. So the content will be * moved, resized, etc as a single image. So it will improve performance -<<<<<<< HEAD - * when you have a complex interafce, with a lot of elements, and will - * need to resize or move it frequently (the content object and its - * children). - * - * Default contents parts of the mapbuf widget that you can use for are: -======= * when you have a complex interface, with a lot of elements, and will * need to resize or move it frequently (the content object and its * children). * * Default content parts of the mapbuf widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "default" - A content of the mapbuf * * Supported elm_object common APIs. @@ -64,11 +56,7 @@ EAPI Evas_Object *elm_mapbuf_add(Evas_Object *parent); * * Also, when enabled, alpha and smooth states will be used, so if the * content isn't solid, alpha should be enabled, for example, otherwise -<<<<<<< HEAD - * a black retangle will fill the content. -======= * a black rectangle will fill the content. ->>>>>>> remotes/origin/upstream * * When disabled, the stored map will be freed and geometry prior to * enabling the map will be restored. diff --git a/src/lib/elm_mirroring.h b/src/lib/elm_mirroring.h index 53ef967..fcedfa9 100644 --- a/src/lib/elm_mirroring.h +++ b/src/lib/elm_mirroring.h @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD - * @defgroup UI-Mirroring Selective Widget mirroring -======= * @defgroup Mirroring Mirroring ->>>>>>> remotes/origin/upstream * * These functions allow you to set ui-mirroring on specific * widgets or the whole interface. Widgets can be in one of two @@ -16,34 +12,18 @@ * @{ */ -<<<<<<< HEAD -EAPI Eina_Bool elm_mirrored_get(void); -EAPI void elm_mirrored_set(Eina_Bool mirrored); - -/** - * Get the system mirrored mode. This determines the default mirrored mode - * of widgets. - * -======= /** * Get the widget's mirrored mode. * * @param obj The widget. ->>>>>>> remotes/origin/upstream * @return EINA_TRUE if mirrored is set, EINA_FALSE otherwise */ EAPI Eina_Bool elm_object_mirrored_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * Set the system mirrored mode. This determines the default mirrored mode - * of widgets. - * -======= * Set the widget's mirrored mode. * * @param obj The widget. ->>>>>>> remotes/origin/upstream * @param mirrored EINA_TRUE to set mirrored mode, EINA_FALSE to unset it. */ EAPI void elm_object_mirrored_set(Evas_Object *obj, Eina_Bool mirrored); diff --git a/src/lib/elm_need.h b/src/lib/elm_need.h index 7600731..1e43269 100644 --- a/src/lib/elm_need.h +++ b/src/lib/elm_need.h @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD - * Request that your elementary application needs efreet -======= * Request that your elementary application needs Efreet ->>>>>>> remotes/origin/upstream * * This initializes the Efreet library when called and if support exists * it returns EINA_TRUE, otherwise returns EINA_FALSE. This must be called diff --git a/src/lib/elm_object.h b/src/lib/elm_object.h index 52a3853..8d1dad8 100644 --- a/src/lib/elm_object.h +++ b/src/lib/elm_object.h @@ -87,11 +87,7 @@ EAPI void elm_object_access_info_set(Evas_Object *obj, c * * @param obj The parent object whose children to look at * @param name The name of the child to find -<<<<<<< HEAD - * @param recurse Set to thge maximum number of levels to recurse (0 == none, 1 is only look at 1 level of children etc.) -======= * @param recurse Set to the maximum number of levels to recurse (0 == none, 1 is only look at 1 level of children etc.) ->>>>>>> remotes/origin/upstream * @return The found object of that name, or NULL if none is found * * This function searches the children (or recursively children of @@ -120,16 +116,6 @@ EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, c */ /** -<<<<<<< HEAD - * Set the style to use by a widget - * - * Sets the style name that will define the appearance of a widget. Styles - * vary from widget to widget and may also be defined by other themes - * by means of extensions and overlays. - * - * @param obj The Elementary widget to style - * @param style The style name to use -======= * Set the style to used by a given widget * * @param obj The Elementary widget to style @@ -139,7 +125,6 @@ EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, c * This sets the style (by name) that will define the appearance of a * widget. Styles vary from widget to widget and may also be defined * by other themes by means of extensions and overlays. ->>>>>>> remotes/origin/upstream * * @see elm_theme_extension_add() * @see elm_theme_extension_del() @@ -148,21 +133,13 @@ EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, c * * @ingroup Styles */ -<<<<<<< HEAD -EAPI void elm_object_style_set(Evas_Object *obj, const char *style); -======= EAPI Eina_Bool elm_object_style_set(Evas_Object *obj, const char *style); ->>>>>>> remotes/origin/upstream /** * Get the style used by the widget * * This gets the style being used for that widget. Note that the string -<<<<<<< HEAD - * pointer is only valid as longas the object is valid and the style doesn't -======= * pointer is only valid as long as the object is valid and the style doesn't ->>>>>>> remotes/origin/upstream * change. * * @param obj The Elementary widget to query for its style @@ -210,18 +187,9 @@ EAPI Eina_Bool elm_object_disabled_get(const Evas_Object *obj); /** * @defgroup WidgetNavigation Widget Tree Navigation. * -<<<<<<< HEAD - * How to check if an Evas Object is an Elementary widget? How to - * get the first elementary widget that is parent of the given - * object? These are all covered in widget tree navigation. - * - * @ref general_functions_example_page "This" example contemplates - * some of these functions. -======= * These functions provide checks for if a Evas_Object is an Elementary widget, * the possibility of getting a widget's parent, top level parent and getting a * string representation of a widget's type. ->>>>>>> remotes/origin/upstream */ /** @@ -314,24 +282,11 @@ EAPI void elm_object_signal_callback_add(Evas_Object *obj, const char *e /** * Remove a signal-triggered callback from a widget edje object. * -<<<<<<< HEAD - * This function removes a callback, previoulsy attached to a - * signal emitted by the edje object of the obj. The parameters - * emission, source and func must match exactly those passed to a - * previous call to elm_object_signal_callback_add(). The data - * pointer that was passed to this call will be returned. - * - * @param obj The object -======= * @param obj The object handle ->>>>>>> remotes/origin/upstream * @param emission The signal's name. * @param source The signal's source. * @param func The callback function to be executed when the signal is * emitted. -<<<<<<< HEAD - * @return The data pointer -======= * @return The data pointer of the signal callback or @c NULL, on * errors. * @@ -342,7 +297,6 @@ EAPI void elm_object_signal_callback_add(Evas_Object *obj, const char *e * elm_object_signal_callback_add(). The data pointer that was passed * to this call will be returned. * ->>>>>>> remotes/origin/upstream * @ingroup General */ EAPI void *elm_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func); @@ -402,11 +356,7 @@ EAPI void elm_object_event_callback_add(Evas_Object *obj, Elm_Event_Cb f /** * Remove an event callback from a widget. * -<<<<<<< HEAD - * This function removes a callback, previoulsy attached to event emission -======= * This function removes a callback, previously attached to event emission ->>>>>>> remotes/origin/upstream * by the @p obj. * The parameters func and data must match exactly those passed to * a previous call to elm_object_event_callback_add(). The data pointer that diff --git a/src/lib/elm_object_item.h b/src/lib/elm_object_item.h index 988342b..4fa1327 100644 --- a/src/lib/elm_object_item.h +++ b/src/lib/elm_object_item.h @@ -1,8 +1,5 @@ -<<<<<<< HEAD -======= typedef void (*Elm_Object_Item_Smart_Cb) (void *data, Elm_Object_Item *it, void *event_info); ->>>>>>> remotes/origin/upstream /** * Get the widget object's handle which contains a given item * @@ -136,11 +133,7 @@ EAPI void elm_object_item_signal_emit(Elm_Object_Item *i /** * Set the disabled state of an widget item. * -<<<<<<< HEAD - * @param obj The Elementary object item -======= * @param it The Elementary object item ->>>>>>> remotes/origin/upstream * @param disabled The state to put in in: @c EINA_TRUE for * disabled, @c EINA_FALSE for enabled * @@ -160,11 +153,7 @@ EAPI void elm_object_item_disabled_set(Elm_Object_Item * /** * Get the disabled state of an widget item. * -<<<<<<< HEAD - * @param obj The Elementary object -======= * @param it The Elementary object item ->>>>>>> remotes/origin/upstream * @return @c EINA_TRUE, if the widget item is disabled, @c EINA_FALSE * if it's enabled (or on errors) * @@ -179,11 +168,7 @@ EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_ * freed. * * @param it The item to set the callback on -<<<<<<< HEAD - * @param func The function called -======= * @param del_cb The function called ->>>>>>> remotes/origin/upstream * * That function will receive these parameters: * @li void * item data @@ -209,11 +194,7 @@ EAPI void elm_object_item_del(Elm_Object_Item *it); /** * Set the text to be shown in a given object item's tooltips. * -<<<<<<< HEAD - * @param item Target item. -======= * @param it Target item. ->>>>>>> remotes/origin/upstream * @param text The text to set in the content. * * Setup the text as tooltip to object. The item can have only one tooltip, @@ -224,31 +205,6 @@ EAPI void elm_object_item_del(Elm_Object_Item *it); * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_tooltip_text_set(Elm_Object_Item *item, const char *text); - -/** - * @brief Disable size restrictions on an object's tooltip - * @param item The tooltip's anchor object - * @param disable If EINA_TRUE, size restrictions are disabled - * @return EINA_FALSE on failure, EINA_TRUE on success - * - * This function allows a tooltip to expand beyond its parant window's canvas. - * It will instead be limited only by the size of the display. - */ -EAPI Eina_Bool elm_object_item_tooltip_window_mode_set(Elm_Object_Item *item, Eina_Bool disable); - -/** - * @brief Retrieve size restriction state of an object's tooltip - * @param obj The tooltip's anchor object - * @return If EINA_TRUE, size restrictions are disabled - * - * This function returns whether a tooltip is allowed to expand beyond - * its parant window's canvas. - * It will instead be limited only by the size of the display. - */ -EAPI Eina_Bool elm_object_item_tooltip_window_mode_get(const Elm_Object_Item *item); -======= EAPI void elm_object_item_tooltip_text_set(Elm_Object_Item *it, const char *text); /** @@ -272,7 +228,6 @@ EAPI Eina_Bool elm_object_item_tooltip_window_mode_set(Elm_Ob * It will instead be limited only by the size of the display. */ EAPI Eina_Bool elm_object_item_tooltip_window_mode_get(const Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream /** * Set the content to be shown in the tooltip item. @@ -283,11 +238,7 @@ EAPI Eina_Bool elm_object_item_tooltip_window_mode_get(const * return a valid Evas_Object. This object is then managed fully by * tooltip system and is deleted when the tooltip is gone. * -<<<<<<< HEAD - * @param item the object item being attached a tooltip. -======= * @param it the object item being attached a tooltip. ->>>>>>> remotes/origin/upstream * @param func the function used to create the tooltip contents. * @param data what to provide to @a func as callback data/context. * @param del_cb called when data is not needed anymore, either when @@ -300,20 +251,12 @@ EAPI Eina_Bool elm_object_item_tooltip_window_mode_get(const * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_tooltip_content_cb_set(Elm_Object_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); -======= EAPI void elm_object_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); ->>>>>>> remotes/origin/upstream /** * Unset tooltip from item. * -<<<<<<< HEAD - * @param item object item to remove previously set tooltip. -======= * @param it object item to remove previously set tooltip. ->>>>>>> remotes/origin/upstream * * Remove tooltip from item. The callback provided as del_cb to * elm_object_item_tooltip_content_cb_set() will be called to notify @@ -324,11 +267,7 @@ EAPI void elm_object_item_tooltip_content_cb_set(Elm_Obj * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_tooltip_unset(Elm_Object_Item *item); -======= EAPI void elm_object_item_tooltip_unset(Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream /** * Sets a different style for this item tooltip. @@ -337,31 +276,19 @@ EAPI void elm_object_item_tooltip_unset(Elm_Object_Item * elm_object_item_tooltip_content_cb_set() or * elm_object_item_tooltip_text_set() * -<<<<<<< HEAD - * @param item object item with tooltip already set. -======= * @param it object item with tooltip already set. ->>>>>>> remotes/origin/upstream * @param style the theme style to use (default, transparent, ...) * * @see elm_object_tooltip_style_set() for more details. * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_tooltip_style_set(Elm_Object_Item *item, const char *style); -======= EAPI void elm_object_item_tooltip_style_set(Elm_Object_Item *it, const char *style); ->>>>>>> remotes/origin/upstream /** * Get the style for this item tooltip. * -<<<<<<< HEAD - * @param item object item with tooltip already set. -======= * @param it object item with tooltip already set. ->>>>>>> remotes/origin/upstream * @return style the theme style in use, defaults to "default". If the * object does not have a tooltip set, then NULL is returned. * @@ -370,23 +297,13 @@ EAPI void elm_object_item_tooltip_style_set(Elm_Object_I * * @ingroup General */ -<<<<<<< HEAD -EAPI const char *elm_object_item_tooltip_style_get(const Elm_Object_Item *item); - - -======= EAPI const char *elm_object_item_tooltip_style_get(const Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream /** * Set the type of mouse pointer/cursor decoration to be shown, * when the mouse pointer is over the given item * -<<<<<<< HEAD - * @param ite, item to customize cursor on -======= * @param it item to customize cursor on ->>>>>>> remotes/origin/upstream * @param cursor the cursor type's name * * This function works analogously as elm_object_cursor_set(), but @@ -404,21 +321,13 @@ EAPI const char *elm_object_item_tooltip_style_get(const Elm_Ob * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_cursor_set(Elm_Object_Item *item, const char *cursor); -======= EAPI void elm_object_item_cursor_set(Elm_Object_Item *it, const char *cursor); ->>>>>>> remotes/origin/upstream /* * Get the type of mouse pointer/cursor decoration set to be shown, * when the mouse pointer is over the given item * -<<<<<<< HEAD - * @param item item with custom cursor set -======= * @param it item with custom cursor set ->>>>>>> remotes/origin/upstream * @return the cursor type's name or @c NULL, if no custom cursors * were set to @p item (and on errors) * @@ -428,22 +337,14 @@ EAPI void elm_object_item_cursor_set(Elm_Object_Item *it * * @ingroup General */ -<<<<<<< HEAD -EAPI const char *elm_object_item_cursor_get(const Elm_Object_Item *item); -======= EAPI const char *elm_object_item_cursor_get(const Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream /** * Unset any custom mouse pointer/cursor decoration set to be * shown, when the mouse pointer is over the given * item, thus making it show the @b default cursor again. * -<<<<<<< HEAD - * @param item the item -======= * @param it the item ->>>>>>> remotes/origin/upstream * * Use this call to undo any custom settings on this item's cursor * decoration, bringing it back to defaults (no custom style set). @@ -453,21 +354,13 @@ EAPI const char *elm_object_item_cursor_get(const Elm_Object_It * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_cursor_unset(Elm_Object_Item *item); -======= EAPI void elm_object_item_cursor_unset(Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream /** * Set a different @b style for a given custom cursor set for an * item. * -<<<<<<< HEAD - * @param item item with custom cursor set -======= * @param it item with custom cursor set ->>>>>>> remotes/origin/upstream * @param style the theme style to use (e.g. @c "default", * @c "transparent", etc) * @@ -475,15 +368,9 @@ EAPI void elm_object_item_cursor_unset(Elm_Object_Item * * cursor decorations defined in a theme file, which can have, * given a cursor name/type, alternate styles on it. It * works analogously as elm_object_cursor_style_set(), but here -<<<<<<< HEAD - * applyed only to item objects. - * - * @warning Before you set a cursor style you should have definen a -======= * applies only to item objects. * * @warning Before you set a cursor style you should have defined a ->>>>>>> remotes/origin/upstream * custom cursor previously on the item, with * elm_object_item_cursor_set() * @@ -492,21 +379,13 @@ EAPI void elm_object_item_cursor_unset(Elm_Object_Item * * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_cursor_style_set(Elm_Object_Item *item, const char *style); -======= EAPI void elm_object_item_cursor_style_set(Elm_Object_Item *it, const char *style); ->>>>>>> remotes/origin/upstream /** * Get the current @b style set for a given item's custom * cursor * -<<<<<<< HEAD - * @param item item with custom cursor set. -======= * @param it item with custom cursor set. ->>>>>>> remotes/origin/upstream * @return style the cursor style in use. If the object does not * have a cursor set, then @c NULL is returned. * @@ -514,22 +393,14 @@ EAPI void elm_object_item_cursor_style_set(Elm_Object_It * * @ingroup General */ -<<<<<<< HEAD -EAPI const char *elm_object_item_cursor_style_get(const Elm_Object_Item *item); -======= EAPI const char *elm_object_item_cursor_style_get(const Elm_Object_Item *it); ->>>>>>> remotes/origin/upstream /** * Set if the (custom)cursor for a given item should be * searched in its theme, also, or should only rely on the * rendering engine. * -<<<<<<< HEAD - * @param item item with custom (custom) cursor already set on -======= * @param it item with custom (custom) cursor already set on ->>>>>>> remotes/origin/upstream * @param engine_only Use @c EINA_TRUE to have cursors looked for * only on those provided by the rendering engine, @c EINA_FALSE to * have them searched on the widget's theme, as well. @@ -542,22 +413,14 @@ EAPI const char *elm_object_item_cursor_style_get(const Elm_Obj * * @ingroup General */ -<<<<<<< HEAD -EAPI void elm_object_item_cursor_engine_only_set(Elm_Object_Item *item, Eina_Bool engine_only); -======= EAPI void elm_object_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only); ->>>>>>> remotes/origin/upstream /** * Get if the (custom) cursor for a given item is being * searched in its theme, also, or is only relying on the rendering * engine. * -<<<<<<< HEAD - * @param item an item -======= * @param it an object item ->>>>>>> remotes/origin/upstream * @return @c EINA_TRUE, if cursors are being looked for only on * those provided by the rendering engine, @c EINA_FALSE if they * are being searched on the widget's theme, as well. @@ -566,10 +429,6 @@ EAPI void elm_object_item_cursor_engine_only_set(Elm_Obj * * @ingroup General */ -<<<<<<< HEAD -EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const Elm_Object_Item *item); - -======= EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const Elm_Object_Item *it); /** @@ -623,4 +482,3 @@ EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const E */ //Don't use this APIs //EAPI void *elm_object_item_smart_callback_del(Elm_Object_Item *it, const char *event, Elm_Object_Item_Smart_Cb func); ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_plug.h b/src/lib/elm_plug.h index fcafa27..8196d9a 100755 --- a/src/lib/elm_plug.h +++ b/src/lib/elm_plug.h @@ -1,21 +1,9 @@ /** * @defgroup Plug Plug * -<<<<<<< HEAD - * - * An object that allows one to show an image which other process created. - * It can be used anywhere like any other elementary widget. - * - * This widget provides the limited functionality because this widget usually used to show socket's image. - * - * If more functionality is needed, it will be added. - * - * -======= * An object that allows one to show an image which other process created. * It can be used anywhere like any other elementary widget. * ->>>>>>> remotes/origin/upstream */ /** @@ -29,10 +17,6 @@ * @param parent The parent object * @return The new plug image object or NULL if it cannot be created * -<<<<<<< HEAD - * -======= ->>>>>>> remotes/origin/upstream * @ingroup Plug */ EAPI Evas_Object *elm_plug_add(Evas_Object *parent); @@ -40,18 +24,6 @@ EAPI Evas_Object *elm_plug_add(Evas_Object *parent); /** * Connect a plug widget to service provided by socket image. * -<<<<<<< HEAD - * @param ee_target The Ecore_Evas containing the canvas in which the new image object will live. - * @param svcname The service name to connect to set up by the socket. - * @param svcnum The service number to connect to (set up by socket). - * @param svcsys Booleain to set if the service is a system one or not (set up by socket). - * @return (@c EINA_TRUE = success, @c EINA_FALSE = error) - * - * - * @ingroup Plug - */ - -======= * @param obj The Evas_Object where the new image object will live. * @param svcname The service name to connect to set up by the socket. * @param svcnum The service number to connect to (set up by socket). @@ -60,7 +32,6 @@ EAPI Evas_Object *elm_plug_add(Evas_Object *parent); * * @ingroup Plug */ ->>>>>>> remotes/origin/upstream EAPI Eina_Bool elm_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys); /** diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index aaff3c9..b91299d 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -43,10 +43,7 @@ typedef struct _Elm_Config Elm_Config; typedef struct _Elm_Module Elm_Module; -<<<<<<< HEAD -======= typedef struct _Elm_Datetime_Module_Data Elm_Datetime_Module_Data; ->>>>>>> remotes/origin/upstream struct _Elm_Theme { @@ -122,10 +119,7 @@ struct _Elm_Config unsigned char thumbscroll_bounce_enable; double thumbscroll_border_friction; double thumbscroll_sensitivity_friction; -<<<<<<< HEAD double scroll_smooth_time_interval; -======= ->>>>>>> remotes/origin/upstream double scroll_smooth_amount; double scroll_smooth_history_weight; double scroll_smooth_future_time; @@ -172,12 +166,9 @@ struct _Elm_Config double glayer_long_tap_start_timeout; int access_mode; Eina_Bool glayer_continues_enable; -<<<<<<< HEAD -======= int week_start; int weekend_start; int weekend_len; ->>>>>>> remotes/origin/upstream /* Not part of the EET file */ Eina_Bool is_mirrored : 1; @@ -200,8 +191,6 @@ struct _Elm_Module int references; }; -<<<<<<< HEAD -======= struct _Elm_Datetime_Module_Data { Evas_Object *base; @@ -209,7 +198,6 @@ struct _Elm_Datetime_Module_Data const char *(*field_format_get)(Evas_Object * obj, Elm_Datetime_Field_Type field_type); }; ->>>>>>> remotes/origin/upstream int _elm_ews_wm_init(void); void _elm_ews_wm_shutdown(void); void _elm_ews_wm_rescale(Elm_Theme *th, Eina_Bool use_theme); @@ -297,10 +285,7 @@ extern const char *_elm_lib_dir; extern int _elm_log_dom; extern Eina_List *_elm_win_list; extern int _elm_win_deferred_free; -<<<<<<< HEAD -======= extern const char *_elm_preferred_engine; ->>>>>>> remotes/origin/upstream #ifdef ENABLE_NLS /* Our gettext wrapper, used to disable translation of elm if the app diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c index a7e5456..3736c2e 100644 --- a/src/lib/elm_route.c +++ b/src/lib/elm_route.c @@ -265,40 +265,6 @@ elm_route_emap_set(Evas_Object *obj, EMap_Route *emap) } #endif -<<<<<<< HEAD -EAPI double -elm_route_lon_min_get(Evas_Object *obj) -{ - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - return wd->lon_min; -} - -EAPI double -elm_route_lat_min_get(Evas_Object *obj) -{ - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - return wd->lat_min; -} - -EAPI double -elm_route_lon_max_get(Evas_Object *obj) -{ - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - return wd->lon_max; -} - -EAPI double -elm_route_lat_max_get(Evas_Object *obj) -{ - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - return wd->lat_max; -} - -======= EINA_DEPRECATED EAPI double elm_route_lon_min_get(Evas_Object *obj) { @@ -350,5 +316,4 @@ elm_route_latitude_min_max_get(const Evas_Object *obj, double *min, double *max) if (min) *min = wd->lat_min; if (max) *max = wd->lat_max; } ->>>>>>> remotes/origin/upstream /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0 :*/ diff --git a/src/lib/elm_route.h b/src/lib/elm_route.h index 3f5092e..24fb981 100644 --- a/src/lib/elm_route.h +++ b/src/lib/elm_route.h @@ -1,13 +1,3 @@ -<<<<<<< HEAD -EAPI Evas_Object *elm_route_add(Evas_Object *parent); -#ifdef ELM_EMAP -EAPI void elm_route_emap_set(Evas_Object *obj, EMap_Route *emap); -#endif -EAPI double elm_route_lon_min_get(Evas_Object *obj); -EAPI double elm_route_lat_min_get(Evas_Object *obj); -EAPI double elm_route_lon_max_get(Evas_Object *obj); -EAPI double elm_route_lat_max_get(Evas_Object *obj); -======= /** * @defgroup Route Route * @@ -62,4 +52,3 @@ EAPI void elm_route_longitude_min_max_get(const Evas_Object *obj, double * @ingroup Route */ EAPI void elm_route_latitude_min_max_get(const Evas_Object *obj, double *min, double *max); ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_scale.h b/src/lib/elm_scale.h index 4433bd7..3477e3e 100644 --- a/src/lib/elm_scale.h +++ b/src/lib/elm_scale.h @@ -14,42 +14,6 @@ */ /** -<<<<<<< HEAD - * Get the global scaling factor - * - * This gets the globally configured scaling factor that is applied to all - * objects. - * - * @return The scaling factor - * @ingroup Scaling - */ -EAPI double elm_scale_get(void); - -/** - * Set the global scaling factor - * - * This sets the globally configured scaling factor that is applied to all - * objects. - * - * @param scale The scaling factor to set - * @ingroup Scaling - */ -EAPI void elm_scale_set(double scale); - -/** - * Set the global scaling factor for all applications on the display - * - * This sets the globally configured scaling factor that is applied to all - * objects for all applications. - * @param scale The scaling factor to set - * @ingroup Scaling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scale_all_set(double scale); - -/** -======= ->>>>>>> remotes/origin/upstream * Set the scaling factor for a given Elementary object * * @param obj The Elementary to operate on diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c index edc8850..5f9e958 100644 --- a/src/lib/elm_theme.c +++ b/src/lib/elm_theme.c @@ -435,8 +435,6 @@ elm_theme_overlay_del(Elm_Theme *th, const char *item) elm_theme_flush(th); } -<<<<<<< HEAD -======= EAPI const Eina_List * elm_theme_overlay_list_get(const Elm_Theme *th) { @@ -444,7 +442,6 @@ elm_theme_overlay_list_get(const Elm_Theme *th) return th->overlay; } ->>>>>>> remotes/origin/upstream EAPI void elm_theme_extension_add(Elm_Theme *th, const char *item) { @@ -474,8 +471,6 @@ elm_theme_extension_del(Elm_Theme *th, const char *item) elm_theme_flush(th); } -<<<<<<< HEAD -======= EAPI const Eina_List * elm_theme_extension_list_get(const Elm_Theme *th) { @@ -483,7 +478,6 @@ elm_theme_extension_list_get(const Elm_Theme *th) return th->extension; } ->>>>>>> remotes/origin/upstream EAPI void elm_theme_set(Elm_Theme *th, const char *theme) { @@ -495,11 +489,8 @@ elm_theme_set(Elm_Theme *th, const char *theme) th->theme = NULL; } elm_theme_flush(th); -<<<<<<< HEAD -======= if (th == &(theme_default)) eina_stringshare_replace(&_elm_config->theme, theme); ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -619,20 +610,11 @@ elm_theme_full_flush(void) elm_theme_flush(&(theme_default)); } -<<<<<<< HEAD -EAPI void -elm_theme_all_set(const char *theme) -{ - eina_stringshare_replace(&_elm_config->theme, theme); - elm_theme_set(NULL, theme); - _elm_config_all_update(); -======= EINA_DEPRECATED EAPI void elm_theme_all_set(const char *theme) { elm_theme_set(NULL, theme); elm_config_all_flush(); ->>>>>>> remotes/origin/upstream } EAPI Eina_List * @@ -678,37 +660,21 @@ elm_theme_name_available_list_new(void) s = strchr(file, '.'); if ((s) && (!strcasecmp(s, ".edj"))) { -<<<<<<< HEAD - int dup; -======= int dupp; ->>>>>>> remotes/origin/upstream th = strdup(file); s = strchr(th, '.'); *s = 0; -<<<<<<< HEAD - dup = 0; -======= dupp = 0; ->>>>>>> remotes/origin/upstream EINA_LIST_FOREACH(list, l, s) { if (!strcmp(s, th)) { -<<<<<<< HEAD - dup = 1; - break; - } - } - if (dup) free(th); -======= dupp = 1; break; } } if (dupp) free(th); ->>>>>>> remotes/origin/upstream else list = eina_list_append(list, th); } } diff --git a/src/lib/elm_theme.h b/src/lib/elm_theme.h index c5a16a3..86cc0c1 100644 --- a/src/lib/elm_theme.h +++ b/src/lib/elm_theme.h @@ -22,11 +22,7 @@ * by setting the @c ELM_THEME environment variable before running an * application, or globally for all programs using the @c elementary_config * utility. Applications can change the default theme using elm_theme_set(), -<<<<<<< HEAD - * but this can go against the user wishes, so it's not an adviced practice. -======= * but this can go against the user wishes, so it's not an advised practice. ->>>>>>> remotes/origin/upstream * * Ideally, applications should find everything they need in the already * provided theme, but there may be occasions when that's not enough and @@ -53,11 +49,7 @@ * theme for the application and will probably clash with the end user * options, not to mention the risk of ending up with not matching styles * across the program. Unless there's a very special reason to use them, -<<<<<<< HEAD - * overlays should be avoided for the resons exposed before. -======= * overlays should be avoided for the reasons exposed before. ->>>>>>> remotes/origin/upstream * * All these theme lists are handled by ::Elm_Theme instances. Elementary * keeps one default internally and every function that receives one of @@ -112,11 +104,7 @@ EAPI Elm_Theme *elm_theme_new(void); EAPI void elm_theme_free(Elm_Theme *th); /** -<<<<<<< HEAD - * Copy the theme fom the source to the destination theme -======= * Copy the theme from the source to the destination theme ->>>>>>> remotes/origin/upstream * * @param th The source theme to copy from * @param thdst The destination theme to copy data to @@ -173,11 +161,7 @@ EAPI Elm_Theme *elm_theme_default_get(void); * new styles, or changing system theme configuration is not possible. Do * NOT use this instead of a proper system theme configuration. Use proper * configuration files, profiles, environment variables etc. to set a theme -<<<<<<< HEAD - * so that the theme can be altered by simple confiugration by a user. Using -======= * so that the theme can be altered by simple configuration by a user. Using ->>>>>>> remotes/origin/upstream * this call to achieve that effect is abusing the API and will create lots * of trouble. * @@ -196,8 +180,6 @@ EAPI void elm_theme_overlay_add(Elm_Theme *th, const char *item); EAPI void elm_theme_overlay_del(Elm_Theme *th, const char *item); /** -<<<<<<< HEAD -======= * Get the list of registered overlays for the given theme * * @param th The theme from which to get the overlays @@ -208,7 +190,6 @@ EAPI void elm_theme_overlay_del(Elm_Theme *th, const char *item); EAPI const Eina_List *elm_theme_overlay_list_get(const Elm_Theme *th); /** ->>>>>>> remotes/origin/upstream * Appends a theme extension to the list of extensions. * * @param th The theme to add to, or if NULL, the default theme @@ -240,8 +221,6 @@ EAPI void elm_theme_extension_add(Elm_Theme *th, const char *item); EAPI void elm_theme_extension_del(Elm_Theme *th, const char *item); /** -<<<<<<< HEAD -======= * Get the list of registered extensions for the given theme * * @param th The theme from which to get the extensions @@ -252,7 +231,6 @@ EAPI void elm_theme_extension_del(Elm_Theme *th, const char *item); EAPI const Eina_List *elm_theme_extension_list_get(const Elm_Theme *th); /** ->>>>>>> remotes/origin/upstream * Set the theme search order for the given theme * * @param th The theme to set the search order, or if NULL, the default theme @@ -298,11 +276,7 @@ EAPI const char *elm_theme_get(Elm_Theme *th); * * A theme element can consist of a full or relative path to a .edj file, * or a name, without extension, for a theme to be searched in the known -<<<<<<< HEAD - * theme paths for Elemementary. -======= * theme paths for Elementary. ->>>>>>> remotes/origin/upstream * * @see elm_theme_set() * @see elm_theme_get() @@ -310,11 +284,7 @@ EAPI const char *elm_theme_get(Elm_Theme *th); EAPI const Eina_List *elm_theme_list_get(const Elm_Theme *th); /** -<<<<<<< HEAD - * Return the full patrh for a theme element -======= * Return the full path for a theme element ->>>>>>> remotes/origin/upstream * * @param f The theme element name * @param in_search_path Pointer to a boolean to indicate if item is in the search path or not @@ -322,19 +292,11 @@ EAPI const Eina_List *elm_theme_list_get(const Elm_Theme *th); * * This returns a string you should free with free() on success, NULL on * failure. This will search for the given theme element, and if it is a -<<<<<<< HEAD - * full or relative path element or a simple searchable name. The returned - * path is the full path to the file, if searched, and the file exists, or it - * is simply the full path given in the element or a resolved path if - * relative to home. The @p in_search_path boolean pointed to is set to - * EINA_TRUE if the file was a searchable file andis in the search path, -======= * full or relative path element or a simple search-able name. The returned * path is the full path to the file, if searched, and the file exists, or it * is simply the full path given in the element or a resolved path if * relative to home. The @p in_search_path boolean pointed to is set to * EINA_TRUE if the file was a search-able file and is in the search path, ->>>>>>> remotes/origin/upstream * and EINA_FALSE otherwise. */ EAPI char *elm_theme_list_item_path_get(const char *f, Eina_Bool *in_search_path); @@ -360,17 +322,6 @@ EAPI void elm_theme_flush(Elm_Theme *th); EAPI void elm_theme_full_flush(void); /** -<<<<<<< HEAD - * Set the theme for all elementary using applications on the current display - * - * @param theme The name of the theme to use. Format same as the ELM_THEME - * environment variable. - */ -EAPI void elm_theme_all_set(const char *theme); - -/** -======= ->>>>>>> remotes/origin/upstream * Return a list of theme elements in the theme search path * * @return A list of strings that are the theme element names. @@ -412,11 +363,7 @@ EAPI void elm_object_theme_set(Evas_Object *obj, Elm_Theme *th); * Get the specific theme to be used * * @param obj The object to get the specific theme from -<<<<<<< HEAD - * @return The specifc theme set. -======= * @return The specific theme set. ->>>>>>> remotes/origin/upstream * * This will return a specific theme set, or NULL if no specific theme is * set on that object. It will not return inherited themes from parents, only diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c index 81efc8e..fee178d 100644 --- a/src/lib/elm_thumb.c +++ b/src/lib/elm_thumb.c @@ -409,11 +409,7 @@ _thumb_show(Widget_Data *wd) { evas_object_show(wd->frame); -<<<<<<< HEAD - if (elm_thumb_ethumb_client_connected()) -======= if (elm_thumb_ethumb_client_connected_get()) ->>>>>>> remotes/origin/upstream { _thumb_apply(wd); return; @@ -632,11 +628,8 @@ elm_thumb_file_set(Evas_Object *obj, const char *file, const char *key) #ifdef HAVE_ELEMENTARY_ETHUMB if (((file_replaced) || (key_replaced)) && (evas_object_visible_get(obj))) _thumb_show(wd); -<<<<<<< HEAD -======= #else (void)key_replaced; ->>>>>>> remotes/origin/upstream #endif } @@ -697,11 +690,7 @@ elm_thumb_ethumb_client_get(void) } EAPI Eina_Bool -<<<<<<< HEAD -elm_thumb_ethumb_client_connected(void) -======= elm_thumb_ethumb_client_connected_get(void) ->>>>>>> remotes/origin/upstream { return _elm_ethumb_connected; } diff --git a/src/lib/elm_thumb.h b/src/lib/elm_thumb.h index 90fc8e3..823b8e4 100644 --- a/src/lib/elm_thumb.h +++ b/src/lib/elm_thumb.h @@ -7,11 +7,7 @@ * A thumb object is used for displaying the thumbnail of an image or video. * You must have compiled Elementary with Ethumb_Client support and the DBus * service must be present and auto-activated in order to have thumbnails to -<<<<<<< HEAD - * be generated. -======= * be generated. You must also have a Session bus, not System bus. ->>>>>>> remotes/origin/upstream * * Once the thumbnail object becomes visible, it will check if there is a * previously generated thumbnail image for the file set on it. If not, it @@ -130,15 +126,9 @@ EAPI void elm_thumb_file_set(Evas_Object *obj, const char EAPI void elm_thumb_file_get(const Evas_Object *obj, const char **file, const char **key); /** -<<<<<<< HEAD - * Get the path and key to the image or video generated by ethumb. - * - * One just need to make sure that the thumbnail was generated before getting -======= * Get the path and key to the image or video thumbnail generated by ethumb. * * One just needs to make sure that the thumbnail was generated before getting ->>>>>>> remotes/origin/upstream * its path; otherwise, the path will be NULL. One way to do that is by asking * for the path when/after the "generate,stop" smart callback is called. * @@ -158,11 +148,7 @@ EAPI void elm_thumb_path_get(const Evas_Object *obj, cons * looping. * * @param obj The thumb object. -<<<<<<< HEAD - * @param setting The animation setting. -======= * @param s The animation setting. ->>>>>>> remotes/origin/upstream * * @see elm_thumb_file_set() * @@ -239,21 +225,13 @@ EAPI void *elm_thumb_ethumb_client_get(void); * @return EINA_TRUE if the client is connected to the server or EINA_FALSE * otherwise. */ -<<<<<<< HEAD -EAPI Eina_Bool elm_thumb_ethumb_client_connected(void); -======= EAPI Eina_Bool elm_thumb_ethumb_client_connected_get(void); ->>>>>>> remotes/origin/upstream /** * Make the thumbnail 'editable'. * * @param obj Thumb object. -<<<<<<< HEAD - * @param set Turn on or off editability. Default is @c EINA_FALSE. -======= * @param edit Turn on or off editability. Default is @c EINA_FALSE. ->>>>>>> remotes/origin/upstream * * This means the thumbnail is a valid drag target for drag and drop, and can be * cut or pasted too. diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c index ede0d2d..9d8769a 100644 --- a/src/lib/elm_video.c +++ b/src/lib/elm_video.c @@ -79,11 +79,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty } if (!strcmp(ev->keyname, "space")) { -<<<<<<< HEAD - if (elm_video_is_playing(obj)) -======= if (elm_video_is_playing_get(obj)) ->>>>>>> remotes/origin/upstream elm_video_pause(obj); else elm_video_play(obj); @@ -314,35 +310,15 @@ elm_video_add(Evas_Object *parent) #endif } -<<<<<<< HEAD -EAPI void -elm_video_file_set(Evas_Object *video, const char *filename) -{ -#ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); -======= EAPI Eina_Bool elm_video_file_set(Evas_Object *video, const char *filename) { #ifdef HAVE_EMOTION ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; ->>>>>>> remotes/origin/upstream Widget_Data *wd = elm_widget_data_get(video); if (wd->remember) emotion_object_last_position_save(wd->emotion); wd->stop = EINA_FALSE; -<<<<<<< HEAD - emotion_object_file_set(wd->emotion, filename); - emotion_object_last_position_load(wd->emotion); - edje_object_signal_emit(wd->layout, "elm,video,load", "elm"); -#else - (void) video; - (void) filename; -#endif -} - -EAPI void -======= if (!emotion_object_file_set(wd->emotion, filename)) return EINA_FALSE; if ((!strncmp(filename, "file://", 7)) || (!strstr(filename, "://"))) @@ -360,7 +336,6 @@ EAPI void } EINA_DEPRECATED EAPI void ->>>>>>> remotes/origin/upstream elm_video_uri_set(Evas_Object *video, const char *uri) { #ifdef HAVE_EMOTION @@ -453,11 +428,7 @@ elm_video_stop(Evas_Object *video) } EAPI Eina_Bool -<<<<<<< HEAD -elm_video_is_playing(const Evas_Object *video) -======= elm_video_is_playing_get(const Evas_Object *video) ->>>>>>> remotes/origin/upstream { #ifdef HAVE_EMOTION ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; @@ -471,11 +442,7 @@ elm_video_is_playing_get(const Evas_Object *video) } EAPI Eina_Bool -<<<<<<< HEAD -elm_video_is_seekable(const Evas_Object *video) -======= elm_video_is_seekable_get(const Evas_Object *video) ->>>>>>> remotes/origin/upstream { #ifdef HAVE_EMOTION ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; diff --git a/src/lib/elm_video.h b/src/lib/elm_video.h index 122b932..5e23532 100644 --- a/src/lib/elm_video.h +++ b/src/lib/elm_video.h @@ -5,18 +5,6 @@ * @{ * * Elementary comes with two object that help design application that need -<<<<<<< HEAD - * to display video. The main one, Elm_Video, display a video by using Emotion. - * It does embedded the video inside an Edje object, so you can do some - * animation depending on the video state change. It does also implement a - * ressource management policy to remove this burden from the application writer. - * - * The second one, Elm_Player is a video player that need to be linked with and Elm_Video. - * It take care of updating its content according to Emotion event and provide a - * way to theme itself. It also does automatically raise the priority of the - * linked Elm_Video so it will use the video decoder if available. It also does - * activate the remember function on the linked Elm_Video object. -======= * to display video. * * The first one, Elm_Video, display a video by using Emotion. @@ -30,7 +18,6 @@ * way to theme itself. It also automatically raises the priority of the * linked Elm_Video so it will use the video decoder, if available. It also * activates the "remember" function on the linked Elm_Video object. ->>>>>>> remotes/origin/upstream * * Signals that you can add callback for are : * @@ -43,11 +30,7 @@ * "rewind,clicked" - the user clicked the rewind button. * "stop,clicked" - the user clicked the stop button. * -<<<<<<< HEAD - * Default contents parts of the player widget that you can use for are: -======= * Default content parts of the player widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "video" - A video of the player * */ @@ -75,46 +58,12 @@ EAPI Evas_Object *elm_player_add(Evas_Object *parent); * This function inserts a new video widget on the canvas. * * @see elm_video_file_set() -<<<<<<< HEAD - * @see elm_video_uri_set() -======= ->>>>>>> remotes/origin/upstream * * @ingroup Video */ EAPI Evas_Object *elm_video_add(Evas_Object *parent); /** -<<<<<<< HEAD - * @brief Define the file that will be the video source. - * - * @param video The video object to define the file for. - * @param filename The file to target. - * - * This function will explicitly define a filename as a source - * for the video of the Elm_Video object. - * - * @see elm_video_uri_set() - * @see elm_video_add() - * @see elm_player_add() - * - * @ingroup Video - */ -EAPI void elm_video_file_set(Evas_Object *video, const char *filename); - -/** - * @brief Define the uri that will be the video source. - * - * @param video The video object to define the file for. - * @param uri The uri to target. - * - * This function will define an uri as a source for the video of the - * Elm_Video object. URI could be remote source of video, like http:// or local source - * like for example WebCam who are most of the time v4l2:// (but that depend and - * you should use Emotion API to request and list the available Webcam on your system). - * - * @see elm_video_file_set() -======= * @brief Define the file or URI that will be the video source. * * @param video The video object to define the file or URI for the video @@ -131,17 +80,12 @@ EAPI void elm_video_file_set(Evas_Object *video, const char *fil * This function will explicitly define a file or URI as a source * for the video of the Elm_Video object. * ->>>>>>> remotes/origin/upstream * @see elm_video_add() * @see elm_player_add() * * @ingroup Video */ -<<<<<<< HEAD -EAPI void elm_video_uri_set(Evas_Object *video, const char *uri); -======= EAPI Eina_Bool elm_video_file_set(Evas_Object *video, const char *filename); ->>>>>>> remotes/origin/upstream /** * @brief Get the underlying Emotion object. @@ -197,11 +141,7 @@ EAPI void elm_video_stop(Evas_Object *video); * * @ingroup Video */ -<<<<<<< HEAD -EAPI Eina_Bool elm_video_is_playing(const Evas_Object *video); -======= EAPI Eina_Bool elm_video_is_playing_get(const Evas_Object *video); ->>>>>>> remotes/origin/upstream /** * @brief Is it possible to seek inside the video. @@ -211,11 +151,7 @@ EAPI Eina_Bool elm_video_is_playing_get(const Evas_Object *video); * * @ingroup Video */ -<<<<<<< HEAD -EAPI Eina_Bool elm_video_is_seekable(const Evas_Object *video); -======= EAPI Eina_Bool elm_video_is_seekable_get(const Evas_Object *video); ->>>>>>> remotes/origin/upstream /** * @brief Is the audio muted. @@ -248,11 +184,7 @@ EAPI void elm_video_audio_mute_set(Evas_Object *video, Eina_Bool EAPI double elm_video_audio_level_get(const Evas_Object *video); /** -<<<<<<< HEAD - * @brief Set the audio level of anElm_Video object. -======= * @brief Set the audio level of an Elm_Video object. ->>>>>>> remotes/origin/upstream * * @param video The video object to proceed the request on. * @param volume The new audio volume. @@ -261,13 +193,6 @@ EAPI double elm_video_audio_level_get(const Evas_Object *video); */ EAPI void elm_video_audio_level_set(Evas_Object *video, double volume); -<<<<<<< HEAD -EAPI double elm_video_play_position_get(const Evas_Object *video); -EAPI void elm_video_play_position_set(Evas_Object *video, double position); -EAPI double elm_video_play_length_get(const Evas_Object *video); -EAPI void elm_video_remember_position_set(Evas_Object *video, Eina_Bool remember); -EAPI Eina_Bool elm_video_remember_position_get(const Evas_Object *video); -======= /** * @brief Get the current position (in seconds) being played in the * Elm_Video object. @@ -336,7 +261,6 @@ EAPI Eina_Bool elm_video_remember_position_get(const Evas_Object *vid * * @ingroup Video */ ->>>>>>> remotes/origin/upstream EAPI const char *elm_video_title_get(const Evas_Object *video); /** * @} diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index b4973d5..f703e7a 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -184,11 +184,7 @@ #warning "there. You only need a widget if you want to seamlessly be part" #warning "of the focus tree and want to transparently become a container" #warning "for any number of child Elementary widgets" -<<<<<<< HEAD //#error "ERROR. Compile aborted." -======= -#error "ERROR. Compile aborted." ->>>>>>> remotes/origin/upstream #endif #define ELM_INTERNAL_API_VERSION 7000 @@ -239,19 +235,11 @@ struct _Elm_Access_Info EAPI void _elm_access_clear(Elm_Access_Info *ac); EAPI void _elm_access_text_set(Elm_Access_Info *ac, int type, const char *text); EAPI void _elm_access_callback_set(Elm_Access_Info *ac, int type, Elm_Access_Content_Cb func, const void *data); -<<<<<<< HEAD -EAPI char *_elm_access_text_get(Elm_Access_Info *ac, int type, Evas_Object *obj, Elm_Widget_Item *item); -EAPI void _elm_access_read(Elm_Access_Info *ac, int type, Evas_Object *obj, Elm_Widget_Item *item); -EAPI void _elm_access_say(const char *txt); -EAPI Elm_Access_Info *_elm_access_object_get(Evas_Object *obj); -EAPI Elm_Access_Info *_elm_access_item_get(Elm_Widget_Item *it); -======= EAPI char *_elm_access_text_get(const Elm_Access_Info *ac, int type, Evas_Object *obj, Elm_Widget_Item *item); /* this is ok it actually returns a strduped string - it's meant to! */ EAPI void _elm_access_read(Elm_Access_Info *ac, int type, Evas_Object *obj, Elm_Widget_Item *item); EAPI void _elm_access_say(const char *txt); EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object *obj); EAPI Elm_Access_Info *_elm_access_item_get(const Elm_Widget_Item *it); ->>>>>>> remotes/origin/upstream EAPI void _elm_access_object_hilight(Evas_Object *obj); EAPI void _elm_access_object_unhilight(Evas_Object *obj); EAPI void _elm_access_object_hilight_disable(Evas *e); @@ -280,10 +268,7 @@ struct _Elm_Widget_Item Evas_Smart_Cb del_func; /**< widget delete callback function. don't expose this callback call */ Elm_Widget_Del_Pre_Cb del_pre_func; -<<<<<<< HEAD -======= Eina_List *callbacks; ->>>>>>> remotes/origin/upstream Elm_Widget_Content_Set_Cb content_set_func; Elm_Widget_Content_Get_Cb content_get_func; @@ -294,16 +279,10 @@ struct _Elm_Widget_Item Elm_Widget_Disable_Cb disable_func; Elm_Access_Info *access; const char *access_info; -<<<<<<< HEAD - Eina_Bool disabled : 1; - /* widget variations should have data from here and on */ - /* @todo: TODO check if this is enough for 1.0 release, maybe add padding! */ -======= Eina_Bool disabled : 1; Eina_Bool walking : 1; Eina_Bool delete_me : 1; ->>>>>>> remotes/origin/upstream }; struct _Elm_Object_Item @@ -313,17 +292,6 @@ struct _Elm_Object_Item #define ELM_NEW(t) calloc(1, sizeof(t)) -<<<<<<< HEAD -#define ELM_OBJ_ITEM_CHECK_OR_RETURN(it, ...) \ - ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)(it), __VA_ARGS__); \ - ELM_CHECK_WIDTYPE(WIDGET(it), widtype) __VA_ARGS__; - -#define ELM_OBJ_ITEM_CHECK_OR_GOTO(it, label) \ - ELM_WIDGET_ITEM_CHECK_OR_GOTO((Elm_Widget_Item *)it, label); \ - if (!elm_widget_type_check(WIDGET(it), (widtype), __func__)) goto label; - -======= ->>>>>>> remotes/origin/upstream EAPI Eina_Bool elm_widget_api_check(int ver); EAPI Evas_Object *elm_widget_add(Evas *evas); EAPI void elm_widget_del_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj)); @@ -338,11 +306,7 @@ EAPI void elm_widget_changed_hook_set(Evas_Object *obj, void (*func) EAPI void elm_widget_signal_emit_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, const char *emission, const char *source)); EAPI void elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)); EAPI void elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)); -<<<<<<< HEAD -EAPI void elm_widget_theme(Evas_Object *obj); -======= EAPI Eina_Bool elm_widget_theme(Evas_Object *obj); ->>>>>>> remotes/origin/upstream EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); EAPI void elm_widget_translate(Evas_Object *obj); EAPI void elm_widget_focus_next_hook_set(Evas_Object *obj, Eina_Bool (*func)(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)); @@ -409,13 +373,8 @@ EAPI void elm_widget_focus_steal(Evas_Object *obj); * * Restore the focus state of the sub-tree. * -<<<<<<< HEAD - * This API will restore the focus state of the sub-tree to the lastest - * state. If a sub-tree is unfocused and wants to get back to the lastest -======= * This API will restore the focus state of the sub-tree to the latest * state. If a sub-tree is unfocused and wants to get back to the latest ->>>>>>> remotes/origin/upstream * focus state, this API will be helpful. * * @param obj The widget root of sub-tree @@ -445,11 +404,7 @@ EAPI Eina_Bool elm_widget_mirrored_automatic_get(const Evas_Object *obj); EAPI void elm_widget_mirrored_automatic_set(Evas_Object *obj, Eina_Bool automatic); EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th); EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj); -<<<<<<< HEAD -EAPI void elm_widget_style_set(Evas_Object *obj, const char *style); -======= EAPI Eina_Bool elm_widget_style_set(Evas_Object *obj, const char *style); ->>>>>>> remotes/origin/upstream EAPI const char *elm_widget_style_get(const Evas_Object *obj); EAPI void elm_widget_type_set(Evas_Object *obj, const char *type); EAPI const char *elm_widget_type_get(const Evas_Object *obj); @@ -475,10 +430,7 @@ EAPI void elm_widget_focus_hide_handle(Evas_Object *obj); EAPI void elm_widget_focus_mouse_up_handle(Evas_Object *obj); EAPI void elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj); EAPI void elm_widget_focus_disabled_handle(Evas_Object *obj); -<<<<<<< HEAD -======= EAPI unsigned int elm_widget_focus_order_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream EAPI void elm_widget_text_part_set(Evas_Object *obj, const char *part, const char *label); EAPI const char *elm_widget_text_part_get(const Evas_Object *obj, const char *part); EAPI void elm_widget_domain_translatable_text_part_set(Evas_Object *obj, const char *part, const char *domain, const char *text); @@ -487,11 +439,7 @@ EAPI void elm_widget_content_part_set(Evas_Object *obj, const char * EAPI Evas_Object *elm_widget_content_part_get(const Evas_Object *obj, const char *part); EAPI Evas_Object *elm_widget_content_part_unset(Evas_Object *obj, const char *part); EAPI void elm_widget_access_info_set(Evas_Object *obj, const char *txt); -<<<<<<< HEAD -EAPI const char *elm_widget_access_info_get(Evas_Object *obj); -======= EAPI const char *elm_widget_access_info_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream EAPI Elm_Widget_Item *_elm_widget_item_new(Evas_Object *parent, size_t alloc_size); EAPI void _elm_widget_item_free(Elm_Widget_Item *item); EAPI void _elm_widget_item_del(Elm_Widget_Item *item); @@ -531,12 +479,9 @@ EAPI void _elm_widget_item_disabled_set(Elm_Widget_Item *item, Eina_ EAPI Eina_Bool _elm_widget_item_disabled_get(const Elm_Widget_Item *item); EAPI void _elm_widget_item_disable_hook_set(Elm_Widget_Item *item, Elm_Widget_Disable_Cb func); EAPI void _elm_widget_item_del_pre_hook_set(Elm_Widget_Item *item, Elm_Widget_Del_Pre_Cb func); -<<<<<<< HEAD -======= EAPI void elm_widget_item_smart_callback_add(Elm_Widget_Item *item, const char *event, Elm_Object_Item_Smart_Cb func, const void *data); EAPI void *elm_widget_item_smart_callback_del(Elm_Widget_Item *item, const char *event, Elm_Object_Item_Smart_Cb func); EAPI void _elm_widget_item_smart_callback_call(Elm_Widget_Item *item, const char *event, void *event_info); ->>>>>>> remotes/origin/upstream /* debug function. don't use it unless you are tracking parenting issues */ EAPI void elm_widget_tree_dump(const Evas_Object *top); @@ -730,32 +675,6 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out */ #define elm_widget_item_del_pre_hook_set(item, func) \ _elm_widget_item_del_pre_hook_set((Elm_Widget_Item *)item, (Elm_Widget_Del_Pre_Cb)func) -<<<<<<< HEAD - -#define ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, ...) \ - do { \ - if (!item) { \ - CRITICAL("Elm_Widget_Item " # item " is NULL!"); \ - return __VA_ARGS__; \ - } \ - if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) { \ - EINA_MAGIC_FAIL(item, ELM_WIDGET_ITEM_MAGIC); \ - return __VA_ARGS__; \ - } \ - } while (0) - -#define ELM_WIDGET_ITEM_CHECK_OR_GOTO(item, label) \ - do { \ - if (!item) { \ - CRITICAL("Elm_Widget_Item " # item " is NULL!"); \ - goto label; \ - } \ - if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) { \ - EINA_MAGIC_FAIL(item, ELM_WIDGET_ITEM_MAGIC); \ - goto label; \ - } \ - } while (0) -======= /** * Convenience function to query callback call hook * @see _elm_widget_item_smart_callback_call() @@ -788,7 +707,6 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out return __VA_ARGS__; \ } \ } while (0) ->>>>>>> remotes/origin/upstream #define ELM_SET_WIDTYPE(widtype, type) \ do { \ @@ -820,15 +738,12 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out ob = elm_widget_add(evas); if (!(ob)) { free(wdat); return (ret); } \ } while (0) -<<<<<<< HEAD -======= #define ELM_OBJ_ITEM_CHECK_OR_RETURN(it, ...) \ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); #define ELM_OBJ_ITEM_CHECK_OR_GOTO(it, label) \ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_GOTO(it, label); ->>>>>>> remotes/origin/upstream /** * The drag and drop API. * Currently experimental, and will change when it does dynamic type @@ -839,20 +754,9 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out * And yes, elm_widget, should probably be elm_experimental... * Complaints about this code should go to /dev/null, or failing that nash. */ -<<<<<<< HEAD -Eina_Bool elm_cnp_selection_set(Elm_Sel_Type selection, Evas_Object *widget, Elm_Sel_Format format, const void *selbuf, size_t buflen); -Eina_Bool elm_selection_clear(Elm_Sel_Type selection, Evas_Object *widget); -Eina_Bool elm_selection_get(Elm_Sel_Type selection, Elm_Sel_Format format, Evas_Object *widget, Elm_Drop_Cb datacb, void *udata); -Eina_Bool elm_selection_selection_has_owner(void); -Eina_Bool elm_drop_target_add(Evas_Object *widget, Elm_Sel_Type, Elm_Drop_Cb, void *); -Eina_Bool elm_drop_target_del(Evas_Object *widget); -Eina_Bool elm_drag_start(Evas_Object *, Elm_Sel_Format, const char *, void (*)(void *, Evas_Object*), void *); - -======= Eina_Bool elm_selection_selection_has_owner(void); Eina_Bool elm_drop_target_add(Evas_Object *widget, Elm_Sel_Type, Elm_Drop_Cb, void *); Eina_Bool elm_drop_target_del(Evas_Object *widget); Eina_Bool elm_drag_start(Evas_Object *, Elm_Sel_Format, const char *, void (*)(void *, Evas_Object *), void *); ->>>>>>> remotes/origin/upstream #endif diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am index f8b767d..f23dc01 100644 --- a/src/modules/access_output/Makefile.am +++ b/src/modules/access_output/Makefile.am @@ -28,10 +28,6 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = mod.c -<<<<<<< HEAD -module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la -======= module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la ->>>>>>> remotes/origin/upstream module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static -- 2.7.4