From: Jeahwan Kim Date: Fri, 10 Sep 2010 10:43:41 +0000 (+0900) Subject: [efl-upgrade] X-Git-Tag: origin~237^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d91a37ba9f0768ecb9ee828e2f510831eea4f58f;p=framework%2Fuifw%2Felementary.git [efl-upgrade] Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary Conflicts: debian/changelog src/lib/Elementary.h.in --- d91a37ba9f0768ecb9ee828e2f510831eea4f58f diff --cc debian/changelog index f60edd9,ac61626..30e0814 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,11 +1,19 @@@ +elementary (1.0.0+svn.51480slp2+build01) unstable; urgency=low + + * efl 1.0 alpha upgrade + * Git: 165.213.180.234:/git/slp/pkgs/elementary + * Tag: elementary_1.0.0+svn.51480slp2+build01 + + -- Jaehwan Kim Tue, 31 Aug 2010 22:57:03 +0900 + + elementary (0.4.0+svn.49550slp2+3build52) unstable; urgency=low + + * repackage for webview + * Git: 165.213.180.234:/git/slp/pkgs/elementary + * Tag: elementary_0.4.0+svn.49550slp2+3build52 + + -- WooHyun Jung Wed, 08 Sep 2010 18:15:30 +0900 + elementary (0.4.0+svn.49550slp2+3build51) unstable; urgency=low * [elm_theme] Added NULL check to elm_theme_get(). diff --cc src/lib/Elementary.h.in index a3cd9e8,a858e5f..6686a32 mode 100755,100644..100755 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@@ -640,8 -631,10 +640,11 @@@ extern "C" EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected); EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item); EAPI const Evas_Object *elm_gengrid_item_object_get(Elm_Gengrid_Item *item); + EAPI Elm_Gengrid_Item *elm_gengrid_selected_item_get(const Evas_Object *obj); EAPI const Eina_List *elm_gengrid_selected_items_get(const Evas_Object *obj); + EAPI const Eina_List *elm_gengrid_items_get(const Evas_Object *obj); + EAPI void elm_gengrid_item_disabled_set(Elm_Gengrid_Item *item, Eina_Bool disabled); + EAPI Eina_Bool elm_gengrid_item_disabled_get(const Elm_Gengrid_Item *item); EAPI Elm_Gengrid_Item *elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gcc, const void *data, Evas_Smart_Cb func, const void *func_data); /* smart callbacks called: * @@@ -1199,39 -1188,26 +1202,41 @@@ struct _Elm_Genlist_Edit_Class { - GenlistRemoveItemFunc remove; - GenlistInsertNewFunc insert_new; - GenlistMoveFunc move; - GenlistItemSelectedFunc item_selected; + GenlistRemoveItemFunc remove; + GenlistInsertNewFunc insert_new; + GenlistMoveFunc move; + GenlistItemSelectedFunc item_selected; + const char *item_style; + const char *select_all_item_style; }; EAPI Evas_Object *elm_genlist_add(Evas_Object *parent); - EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data); - EAPI Elm_Genlist_Item *elm_genlist_item_append_with_group(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Elm_Genlist_GroupItem *git, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data); - EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data); - EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data); - EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data); - EAPI void elm_genlist_item_move_after(Elm_Genlist_Item *it, Elm_Genlist_Item *after ); EAPI void elm_genlist_clear(Evas_Object *obj); - EAPI Elm_Genlist_GroupItem *elm_genlist_groupitem_add(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data); - EAPI void elm_genlist_groupitem_del( Elm_Genlist_GroupItem *git); EAPI void elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi); EAPI Eina_Bool elm_genlist_multi_select_get(const Evas_Object *obj); + EAPI void elm_genlist_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode); + EAPI Elm_List_Mode elm_genlist_horizontal_mode_get(const Evas_Object *obj); + EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); + EAPI Eina_Bool elm_genlist_always_select_mode_get(const Evas_Object *obj); + EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select); + EAPI Eina_Bool elm_genlist_no_select_mode_get(const Evas_Object *obj); + EAPI void elm_genlist_compress_mode_set(Evas_Object *obj, Eina_Bool compress); + EAPI Eina_Bool elm_genlist_compress_mode_get(const Evas_Object *obj); + EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); + EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); + EAPI void elm_genlist_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous); + EAPI Eina_Bool elm_genlist_homogeneous_get(const Evas_Object *obj); + EAPI void elm_genlist_block_count_set(Evas_Object *obj, int n); + EAPI int elm_genlist_block_count_get(const Evas_Object *obj); + EAPI void elm_genlist_longpress_timeout_set(const Evas_Object *obj, double timeout); + EAPI double elm_genlist_longpress_timeout_get(const Evas_Object *obj); + + /* operations to add items */ + EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); + EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); + EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); + EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); + /* operations to retrieve existing items */ EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj); EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj); EAPI Eina_List *elm_genlist_realized_items_get(const Evas_Object *obj); diff --cc src/lib/elm_gengrid.c index ef6370b,0e9e567..ee144f6 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@@ -922,8 -927,11 +922,10 @@@ _scr_scroll(void *data, Evas_Object *ob EAPI Evas_Object * elm_gengrid_add(Evas_Object *parent) { + if (!parent) return NULL; + Evas_Object *obj; Evas *e; - Evas_Coord minw, minh; Widget_Data *wd; static Evas_Smart *smart = NULL; diff --cc src/lib/elm_genlist.c index e91ce04,aca68ae..1a373ba --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@@ -272,8 -276,8 +272,9 @@@ struct _Widget_Dat int item_width; int item_height; int max_items_per_block; + double longpress_timeout; int edit_mode; + int select_all_minh; Eina_Bool animate_edit_controls :1; Edit_Data *ed; diff --cc src/lib/elm_pager.c index 473c795,c13e0a9..4c47da6 mode 100755,100644..100755 --- a/src/lib/elm_pager.c +++ b/src/lib/elm_pager.c