From: Enlightenment S. <no-...@en...> - 2011-06-16 06:19:21
|
Log: Elm scrollend_entry: Fix group of elm_scrolled_entry_is_empty. Patch by Jihoon Kim. Author: tasn Date: 2011-06-15 23:19:15 -0700 (Wed, 15 Jun 2011) New Revision: 60373 Trac: http://trac.enlightenment.org/e/changeset/60373 Modified: trunk/elementary/src/lib/elc_scrolled_entry.c Modified: trunk/elementary/src/lib/elc_scrolled_entry.c =================================================================== --- trunk/elementary/src/lib/elc_scrolled_entry.c 2011-06-16 05:32:45 UTC (rev 60372) +++ trunk/elementary/src/lib/elc_scrolled_entry.c 2011-06-16 06:19:15 UTC (rev 60373) @@ -785,7 +785,7 @@ * @param obj The entry object * @return If the entry is empty or not. * - * @ingroup Entry + * @ingroup Scrolled_Entry */ EAPI Eina_Bool elm_scrolled_entry_is_empty(const Evas_Object *obj) |
From: Enlightenment S. <no-...@en...> - 2011-06-24 08:44:45
|
Log: Elementary entry: Added handling of the preedit,changed signal. Patch by Jihoon Kim. Author: tasn Date: 2011-06-24 01:44:39 -0700 (Fri, 24 Jun 2011) New Revision: 60659 Trac: http://trac.enlightenment.org/e/changeset/60659 Modified: trunk/elementary/src/lib/elm_entry.c Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-06-24 08:43:38 UTC (rev 60658) +++ trunk/elementary/src/lib/elm_entry.c 2011-06-24 08:44:39 UTC (rev 60659) @@ -91,6 +91,7 @@ * "selection,cleared" - The selection has been cleared * "cursor,changed" - The cursor has changed * "anchor,clicked" - The anchor has been clicked + * "preedit,changed" - The preedit string has changed */ /* Maximum chunk size to be inserted to the entry at once @@ -223,6 +224,7 @@ static const char SIG_SELECTION_CLEARED[] = "selection,cleared"; static const char SIG_CURSOR_CHANGED[] = "cursor,changed"; static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked"; +static const char SIG_PREEDIT_CHANGED[] = "preedit,changed"; static const Evas_Smart_Cb_Description _signals[] = { {SIG_CHANGED, ""}, {SIG_ACTIVATED, ""}, @@ -240,6 +242,7 @@ {SIG_SELECTION_CLEARED, ""}, {SIG_CURSOR_CHANGED, ""}, {SIG_ANCHOR_CLICKED, ""}, + {SIG_PREEDIT_CHANGED, ""}, {NULL, NULL} }; @@ -1301,7 +1304,7 @@ } static void -_signal_entry_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_entry_changed_common_handling(void *data, const char *event) { Widget_Data *wd = elm_widget_data_get(data); Evas_Coord minh; @@ -1326,6 +1329,18 @@ } static void +_signal_entry_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +{ + _entry_changed_common_handling(data, SIG_CHANGED); +} + +static void +_signal_preedit_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +{ + _entry_changed_common_handling(data, SIG_PREEDIT_CHANGED); +} + +static void _signal_selection_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); @@ -1909,6 +1924,8 @@ _elm_theme_object_set(obj, wd->ent, "entry", "base", "default"); edje_object_signal_callback_add(wd->ent, "entry,changed", "elm.text", _signal_entry_changed, obj); + edje_object_signal_callback_add(wd->ent, "preedit,changed", "elm.text", + _signal_preedit_changed, obj); edje_object_signal_callback_add(wd->ent, "selection,start", "elm.text", _signal_selection_start, obj); edje_object_signal_callback_add(wd->ent, "selection,changed", "elm.text", |
From: Enlightenment S. <no-...@en...> - 2011-06-27 00:21:00
|
Log: Elm entry: Fix entry changed signal handling. Patch by Jihoon Kim. Author: tasn Date: 2011-06-26 17:20:54 -0700 (Sun, 26 Jun 2011) New Revision: 60708 Trac: http://trac.enlightenment.org/e/changeset/60708 Modified: trunk/elementary/src/lib/elm_entry.c Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-06-26 23:11:07 UTC (rev 60707) +++ trunk/elementary/src/lib/elm_entry.c 2011-06-27 00:20:54 UTC (rev 60708) @@ -1318,7 +1318,7 @@ _sizing_eval(data); if (wd->text) eina_stringshare_del(wd->text); wd->text = NULL; - evas_object_smart_callback_call(data, SIG_CHANGED, NULL); + evas_object_smart_callback_call(data, event, NULL); if (wd->delay_write) { ecore_timer_del(wd->delay_write); |
From: Enlightenment S. <no-...@en...> - 2011-06-29 07:11:56
|
Log: Elm button: add the elm_object_text_set/get hooks. deprecate: elm_button_label_set and elm_button_label_get Author: tasn Date: 2011-06-29 00:11:50 -0700 (Wed, 29 Jun 2011) New Revision: 60799 Trac: http://trac.enlightenment.org/e/changeset/60799 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_button.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-06-29 06:41:31 UTC (rev 60798) +++ trunk/elementary/src/lib/Elementary.h.in 2011-06-29 07:11:50 UTC (rev 60799) @@ -2391,8 +2391,9 @@ * * @param obj The button object * @param label The text will be written on the button + * @deprecated use elm_object_text_set() instead. */ - EAPI void elm_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); /** * Get the label set for the button * @@ -2404,8 +2405,9 @@ * * @param obj The button object * @return The text set to the label, or NULL if nothing is set + * @deprecated use elm_object_text_set() instead. */ - EAPI const char *elm_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Set the icon used for the button * Modified: trunk/elementary/src/lib/elm_button.c =================================================================== --- trunk/elementary/src/lib/elm_button.c 2011-06-29 06:41:31 UTC (rev 60798) +++ trunk/elementary/src/lib/elm_button.c 2011-06-29 07:11:50 UTC (rev 60799) @@ -285,6 +285,33 @@ evas_object_smart_callback_call(data, SIG_UNPRESSED, NULL); } +static void +_elm_button_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + eina_stringshare_replace(&wd->label, label); + if (label) + edje_object_signal_emit(wd->btn, "elm,state,text,visible", "elm"); + else + edje_object_signal_emit(wd->btn, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->btn); + edje_object_part_text_set(wd->btn, "elm.text", label); + _sizing_eval(obj); +} + +static const char * +_elm_button_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return wd->label; +} + EAPI Evas_Object * elm_button_add(Evas_Object *parent) { @@ -308,6 +335,8 @@ elm_widget_signal_emit_hook_set(obj, _signal_emit_hook); elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook); elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook); + elm_widget_label_set_hook_set(obj, _elm_button_label_set); + elm_widget_label_get_hook_set(obj, _elm_button_label_get); wd->btn = edje_object_add(e); _elm_theme_object_set(obj, wd->btn, "button", "base", "default"); @@ -332,26 +361,13 @@ EAPI void elm_button_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->label, label); - if (label) - edje_object_signal_emit(wd->btn, "elm,state,text,visible", "elm"); - else - edje_object_signal_emit(wd->btn, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->btn); - edje_object_part_text_set(wd->btn, "elm.text", label); - _sizing_eval(obj); + _elm_button_label_set(obj, NULL, label); } EAPI const char * elm_button_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_button_label_get(obj, NULL); } EAPI void |
From: Enlightenment S. <no-...@en...> - 2011-06-29 08:57:48
|
Log: Elm toggle: add the elm_object_text_set/get hooks. deprecate: elm_toggle_label_set/get Author: tasn Date: 2011-06-29 01:57:40 -0700 (Wed, 29 Jun 2011) New Revision: 60802 Trac: http://trac.enlightenment.org/e/changeset/60802 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_toggle.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-06-29 08:24:13 UTC (rev 60801) +++ trunk/elementary/src/lib/Elementary.h.in 2011-06-29 08:57:40 UTC (rev 60802) @@ -2638,8 +2638,8 @@ /* toggle */ EAPI Evas_Object *elm_toggle_add(Evas_Object *parent) EINA_ARG_NONNULL(1); - EAPI void elm_toggle_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - EAPI const char *elm_toggle_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_toggle_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_toggle_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_toggle_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_toggle_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/elementary/src/lib/elm_toggle.c 2011-06-29 08:24:13 UTC (rev 60801) +++ trunk/elementary/src/lib/elm_toggle.c 2011-06-29 08:57:40 UTC (rev 60802) @@ -201,6 +201,33 @@ evas_object_smart_callback_call(data, SIG_CHANGED, NULL); } +static void +_elm_toggle_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + eina_stringshare_replace(&wd->label, label); + if (label) + edje_object_signal_emit(wd->tgl, "elm,state,text,visible", "elm"); + else + edje_object_signal_emit(wd->tgl, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->tgl); + edje_object_part_text_set(wd->tgl, "elm.text", label); + _sizing_eval(obj); +} + +static const char * +_elm_toggle_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return wd->label; +} + /** * Add a toggle to @p parent. * @@ -229,6 +256,8 @@ elm_widget_disable_hook_set(obj, _disable_hook); elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_event_hook_set(obj, _event_hook); + elm_widget_label_set_hook_set(obj, _elm_toggle_label_set); + elm_widget_label_get_hook_set(obj, _elm_toggle_label_get); wd->tgl = edje_object_add(e); _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -265,17 +294,7 @@ EAPI void elm_toggle_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->label, label); - if (label) - edje_object_signal_emit(wd->tgl, "elm,state,text,visible", "elm"); - else - edje_object_signal_emit(wd->tgl, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->tgl); - edje_object_part_text_set(wd->tgl, "elm.text", label); - _sizing_eval(obj); + _elm_toggle_label_set(obj, NULL, label); } /** @@ -289,10 +308,7 @@ EAPI const char * elm_toggle_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_toggle_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-06-29 09:11:49
|
Log: Elm toggle: Also add a deprecation notice to the docs. Author: tasn Date: 2011-06-29 02:11:42 -0700 (Wed, 29 Jun 2011) New Revision: 60804 Trac: http://trac.enlightenment.org/e/changeset/60804 Modified: trunk/elementary/src/lib/elm_toggle.c Modified: trunk/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/elementary/src/lib/elm_toggle.c 2011-06-29 08:57:43 UTC (rev 60803) +++ trunk/elementary/src/lib/elm_toggle.c 2011-06-29 09:11:42 UTC (rev 60804) @@ -290,6 +290,7 @@ * @param label The label to be displayed * * @ingroup Toggle + * @deprecate use elm_object_text_* instead. */ EAPI void elm_toggle_label_set(Evas_Object *obj, const char *label) @@ -304,6 +305,7 @@ * @return The label of the toggle * * @ingroup Toggle + * @deprecate use elm_object_text_* instead. */ EAPI const char * elm_toggle_label_get(const Evas_Object *obj) |
From: Enlightenment S. <no-...@en...> - 2011-06-29 09:11:51
|
Log: Elm frame: add the elm_object_text_set/get hooks. deprecate: elm_frame_label_set/get Author: tasn Date: 2011-06-29 02:11:45 -0700 (Wed, 29 Jun 2011) New Revision: 60805 Trac: http://trac.enlightenment.org/e/changeset/60805 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_frame.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-06-29 09:11:42 UTC (rev 60804) +++ trunk/elementary/src/lib/Elementary.h.in 2011-06-29 09:11:45 UTC (rev 60805) @@ -2656,8 +2656,8 @@ /* frame */ EAPI Evas_Object *elm_frame_add(Evas_Object *parent) EINA_ARG_NONNULL(1); - EAPI void elm_frame_label_set(Evas_Object *obj, const char *label); EINA_ARG_NONNULL(1) - EAPI const char *elm_frame_label_get(const Evas_Object *obj); EINA_ARG_NONNULL(1) + EINA_DEPRECATED EAPI void elm_frame_label_set(Evas_Object *obj, const char *label); EINA_ARG_NONNULL(1) + EINA_DEPRECATED EAPI const char *elm_frame_label_get(const Evas_Object *obj); EINA_ARG_NONNULL(1) EAPI void elm_frame_content_set(Evas_Object *obj, Evas_Object *content); EINA_ARG_NONNULL(1) EAPI Evas_Object *elm_frame_content_get(const Evas_Object *obj); EINA_ARG_NONNULL(1) EAPI Evas_Object *elm_frame_content_unset(Evas_Object *obj); EINA_ARG_NONNULL(1) Modified: trunk/elementary/src/lib/elm_frame.c =================================================================== --- trunk/elementary/src/lib/elm_frame.c 2011-06-29 09:11:42 UTC (rev 60804) +++ trunk/elementary/src/lib/elm_frame.c 2011-06-29 09:11:45 UTC (rev 60805) @@ -109,6 +109,28 @@ } } +static void +_elm_frame_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + eina_stringshare_replace(&(wd->label), label); + edje_object_part_text_set(wd->frm, "elm.text", wd->label); + _sizing_eval(obj); +} + +static const char * +_elm_frame_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return wd->label; +} + /** * Add a new frame to the parent * @@ -134,6 +156,8 @@ elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_focus_next_hook_set(obj, _elm_frame_focus_next_hook); elm_widget_can_focus_set(obj, EINA_FALSE); + elm_widget_label_set_hook_set(obj, _elm_frame_label_set); + elm_widget_label_get_hook_set(obj, _elm_frame_label_get); wd->frm = edje_object_add(e); _elm_theme_object_set(obj, wd->frm, "frame", "base", "default"); @@ -153,16 +177,12 @@ * @param label The label of this frame object * * @ingroup Frame + * @deprecate use elm_object_text_* instead. */ EAPI void elm_frame_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&(wd->label), label); - edje_object_part_text_set(wd->frm, "elm.text", wd->label); - _sizing_eval(obj); + _elm_frame_label_set(obj, NULL, label); } /** @@ -173,14 +193,12 @@ * @return The label of this frame objet or NULL if unable to get frame * * @ingroup Frame + * @deprecate use elm_object_text_* instead. */ EAPI const char * elm_frame_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_frame_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-06-29 09:31:02
|
Log: Elm layout: add the elm_object_text_set/get hooks. deprecate: elm_layout_label_set/get Author: tasn Date: 2011-06-29 02:30:56 -0700 (Wed, 29 Jun 2011) New Revision: 60807 Trac: http://trac.enlightenment.org/e/changeset/60807 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_layout.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-06-29 09:11:48 UTC (rev 60806) +++ trunk/elementary/src/lib/Elementary.h.in 2011-06-29 09:30:56 UTC (rev 60807) @@ -2831,8 +2831,8 @@ EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); - EAPI void elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) EINA_ARG_NONNULL(1); - EAPI const char *elm_layout_text_get(const Evas_Object *obj, const char *part) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_layout_text_get(const Evas_Object *obj, const char *part) EINA_ARG_NONNULL(1); EAPI void elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child) EINA_ARG_NONNULL(1); EAPI void elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child) EINA_ARG_NONNULL(1); EAPI void elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference) EINA_ARG_NONNULL(1); @@ -2910,6 +2910,7 @@ * Elementary naming convention for its parts. * * @ingroup Layout + * @deprecate use elm_object_text_* instead. */ #define elm_layout_label_set(_ly, _txt) \ elm_layout_text_set((_ly), "elm.text", (_txt)) @@ -2920,6 +2921,7 @@ * Elementary naming convention for its parts. * * @ingroup Layout + * @deprecate use elm_object_text_* instead. */ #define elm_layout_label_get(_ly) \ elm_layout_text_get((_ly), "elm.text") Modified: trunk/elementary/src/lib/elm_layout.c =================================================================== --- trunk/elementary/src/lib/elm_layout.c 2011-06-29 09:11:48 UTC (rev 60806) +++ trunk/elementary/src/lib/elm_layout.c 2011-06-29 09:30:56 UTC (rev 60807) @@ -306,6 +306,57 @@ } } +static void +_elm_layout_label_set(Evas_Object *obj, const char *part, const char *text) +{ + Widget_Data *wd = elm_widget_data_get(obj); + Subinfo *si = NULL; + Eina_List *l; + ELM_CHECK_WIDTYPE(obj, widtype); + if (!part) part = "elm.text"; + + EINA_LIST_FOREACH(wd->subs, l, si) + { + if ((si->type == TEXT) && (!strcmp(part, si->part))) + { + if (!text) + { + eina_stringshare_del(si->part); + eina_stringshare_del(si->p.text.text); + free(si); + edje_object_part_text_set(wd->lay, part, NULL); + wd->subs = eina_list_remove_list(wd->subs, l); + return; + } + else + break; + } + si = NULL; + } + + if (!si) + { + si = ELM_NEW(Subinfo); + if (!si) return; + si->type = TEXT; + si->part = eina_stringshare_add(part); + wd->subs = eina_list_append(wd->subs, si); + } + + eina_stringshare_replace(&si->p.text.text, text); + edje_object_part_text_set(wd->lay, part, text); + _request_sizing_eval(wd); +} + +static const char * +_elm_layout_label_get(const Evas_Object *obj, const char *part) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (!part) part = "elm.text"; + return edje_object_part_text_get(wd->lay, part); +} + /** * Add a new layout to the parent * @@ -335,6 +386,8 @@ elm_widget_signal_emit_hook_set(obj, _signal_emit_hook); elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook); elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook); + elm_widget_label_set_hook_set(obj, _elm_layout_label_set); + elm_widget_label_get_hook_set(obj, _elm_layout_label_get); wd->obj = obj; wd->lay = edje_object_add(e); @@ -522,46 +575,12 @@ * @param text The text to set * * @ingroup Layout + * @deprecate use elm_object_text_* instead. */ EAPI void elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) { - Widget_Data *wd = elm_widget_data_get(obj); - Subinfo *si = NULL; - Eina_List *l; - ELM_CHECK_WIDTYPE(obj, widtype); - - EINA_LIST_FOREACH(wd->subs, l, si) - { - if ((si->type == TEXT) && (!strcmp(part, si->part))) - { - if (!text) - { - eina_stringshare_del(si->part); - eina_stringshare_del(si->p.text.text); - free(si); - edje_object_part_text_set(wd->lay, part, NULL); - wd->subs = eina_list_remove_list(wd->subs, l); - return; - } - else - break; - } - si = NULL; - } - - if (!si) - { - si = ELM_NEW(Subinfo); - if (!si) return; - si->type = TEXT; - si->part = eina_stringshare_add(part); - wd->subs = eina_list_append(wd->subs, si); - } - - eina_stringshare_replace(&si->p.text.text, text); - edje_object_part_text_set(wd->lay, part, text); - _request_sizing_eval(wd); + _elm_layout_label_set(obj, part, text); } /** @@ -573,13 +592,12 @@ * @return The text set in @p part * * @ingroup Layout + * @deprecate use elm_object_text_* instead. */ EAPI const char * elm_layout_text_get(const Evas_Object *obj, const char *part) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - return edje_object_part_text_get(wd->lay, part); + return _elm_layout_label_get(obj, part); } /** |
From: Enlightenment S. <no-...@en...> - 2011-06-29 09:31:09
|
Log: Elm: Fix a couple more deprecation warnings and use elm_object_text_set/get. Author: tasn Date: 2011-06-29 02:31:01 -0700 (Wed, 29 Jun 2011) New Revision: 60809 Trac: http://trac.enlightenment.org/e/changeset/60809 Modified: trunk/elementary/src/lib/elc_fileselector.c trunk/elementary/src/lib/elc_fileselector_button.c trunk/elementary/src/lib/elc_hoversel.c Modified: trunk/elementary/src/lib/elc_fileselector.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector.c 2011-06-29 09:30:58 UTC (rev 60808) +++ trunk/elementary/src/lib/elc_fileselector.c 2011-06-29 09:31:01 UTC (rev 60809) @@ -848,7 +848,7 @@ bt = elm_button_add(parent); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); elm_button_icon_set(bt, ic); - elm_button_label_set(bt, E_("Up")); + elm_object_text_set(bt, E_("Up")); evas_object_size_hint_align_set(bt, 0.0, 0.0); evas_object_smart_callback_add(bt, "clicked", _up, obj); @@ -863,7 +863,7 @@ bt = elm_button_add(parent); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); elm_button_icon_set(bt, ic); - elm_button_label_set(bt, E_("Home")); + elm_object_text_set(bt, E_("Home")); evas_object_size_hint_align_set(bt, 0.0, 0.0); evas_object_smart_callback_add(bt, "clicked", _home, obj); @@ -1051,7 +1051,7 @@ // cancel btn bt = elm_button_add(obj); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); - elm_button_label_set(bt, E_("Cancel")); + elm_object_text_set(bt, E_("Cancel")); evas_object_smart_callback_add(bt, "clicked", _canc, obj); @@ -1061,7 +1061,7 @@ // ok btn bt = elm_button_add(obj); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); - elm_button_label_set(bt, E_("OK")); + elm_object_text_set(bt, E_("OK")); evas_object_smart_callback_add(bt, "clicked", _ok, obj); Modified: trunk/elementary/src/lib/elc_fileselector_button.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_button.c 2011-06-29 09:30:58 UTC (rev 60808) +++ trunk/elementary/src/lib/elc_fileselector_button.c 2011-06-29 09:31:01 UTC (rev 60809) @@ -319,7 +319,7 @@ ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - elm_button_label_set(wd->btn, label); + elm_object_text_set(wd->btn, label); } /** @@ -336,7 +336,7 @@ ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - return elm_button_label_get(wd->btn); + return elm_object_text_get(wd->btn); } /** Modified: trunk/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/elementary/src/lib/elc_hoversel.c 2011-06-29 09:30:58 UTC (rev 60808) +++ trunk/elementary/src/lib/elc_hoversel.c 2011-06-29 09:31:01 UTC (rev 60809) @@ -210,7 +210,7 @@ elm_widget_mirrored_automatic_set(bt, EINA_FALSE); elm_widget_mirrored_set(bt, elm_widget_mirrored_get(obj)); elm_object_style_set(bt, buf); - elm_button_label_set(bt, item->label); + elm_object_text_set(bt, item->label); if (item->icon_file) { ic = elm_icon_add(obj); @@ -363,7 +363,7 @@ * Set the hoversel button label * * This sets the label of the button that is always visible (before it is - * clicked and expanded). Also see elm_button_label_set(). + * clicked and expanded). Also see elm_object_text_set(). * * @param obj The hoversel object * @param label The label text. @@ -376,7 +376,7 @@ ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - elm_button_label_set(wd->btn, label); + elm_object_text_set(wd->btn, label); } /** @@ -393,7 +393,7 @@ ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if ((!wd) || (!wd->btn)) return NULL; - return elm_button_label_get(wd->btn); + return elm_object_text_get(wd->btn); } /** |
From: Enlightenment S. <no-...@en...> - 2011-06-30 05:44:02
|
Log: elm hoversel: add the elm_object_text_set/get hooks. deprecate: elm_hoversel_label_set/get Author: tasn Date: 2011-06-29 22:43:56 -0700 (Wed, 29 Jun 2011) New Revision: 60860 Trac: http://trac.enlightenment.org/e/changeset/60860 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elc_hoversel.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-06-30 05:38:57 UTC (rev 60859) +++ trunk/elementary/src/lib/Elementary.h.in 2011-06-30 05:43:56 UTC (rev 60860) @@ -3881,8 +3881,8 @@ EAPI Eina_Bool elm_hoversel_horizontal_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_hoversel_hover_parent_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - EAPI void elm_hoversel_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - EAPI const char *elm_hoversel_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_hoversel_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_hoversel_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_hoversel_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_hoversel_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_hoversel_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/elementary/src/lib/elc_hoversel.c 2011-06-30 05:38:57 UTC (rev 60859) +++ trunk/elementary/src/lib/elc_hoversel.c 2011-06-30 05:43:56 UTC (rev 60860) @@ -267,6 +267,26 @@ wd->hover_parent = NULL; } +static void +_elm_hoversel_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + elm_object_text_set(wd->btn, label); +} + +static const char * +_elm_hoversel_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if ((!wd) || (!wd->btn)) return NULL; + return elm_object_text_get(wd->btn); +} + /** * Add a new Hoversel object * @@ -295,6 +315,8 @@ elm_widget_activate_hook_set(obj, _activate_hook); elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); elm_widget_can_focus_set(obj, EINA_TRUE); + elm_widget_label_set_hook_set(obj, _elm_hoversel_label_set); + elm_widget_label_get_hook_set(obj, _elm_hoversel_label_get); wd->btn = elm_button_add(parent); elm_widget_mirrored_automatic_set(wd->btn, EINA_FALSE); @@ -373,10 +395,7 @@ EAPI void elm_hoversel_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_object_text_set(wd->btn, label); + _elm_hoversel_label_set(obj, NULL, label); } /** @@ -390,10 +409,7 @@ EAPI const char * elm_hoversel_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if ((!wd) || (!wd->btn)) return NULL; - return elm_object_text_get(wd->btn); + return _elm_hoversel_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-06-30 05:58:35
|
Log: elm slider: add the elm_object_text_set/get hooks. deprecate: elm_slider_label_set/get Author: tasn Date: 2011-06-29 22:58:29 -0700 (Wed, 29 Jun 2011) New Revision: 60862 Trac: http://trac.enlightenment.org/e/changeset/60862 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_slider.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-06-30 05:43:59 UTC (rev 60861) +++ trunk/elementary/src/lib/Elementary.h.in 2011-06-30 05:58:29 UTC (rev 60862) @@ -4125,8 +4125,8 @@ /* slider */ EAPI Evas_Object *elm_slider_add(Evas_Object *parent) EINA_ARG_NONNULL(1); - EAPI void elm_slider_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - EAPI const char *elm_slider_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_slider_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_slider_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_slider_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_slider_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elm_slider.c =================================================================== --- trunk/elementary/src/lib/elm_slider.c 2011-06-30 05:43:59 UTC (rev 60861) +++ trunk/elementary/src/lib/elm_slider.c 2011-06-30 05:58:29 UTC (rev 60862) @@ -482,6 +482,38 @@ evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, 0, NULL); } +static void +_elm_slider_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + eina_stringshare_replace(&wd->label, label); + if (label) + { + edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm"); + edje_object_message_signal_process(wd->slider); + } + else + { + edje_object_signal_emit(wd->slider, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->slider); + } + edje_object_part_text_set(wd->slider, "elm.text", label); + _sizing_eval(obj); +} + +static const char * +_elm_slider_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return wd->label; +} + /** * Add a new slider to the parent * @@ -509,6 +541,8 @@ elm_widget_disable_hook_set(obj, _disable_hook); elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_event_hook_set(obj, _event_hook); + elm_widget_label_set_hook_set(obj, _elm_slider_label_set); + elm_widget_label_get_hook_set(obj, _elm_slider_label_get); wd->horizontal = EINA_TRUE; wd->indicator_show = EINA_TRUE; @@ -555,22 +589,7 @@ EAPI void elm_slider_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->label, label); - if (label) - { - edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->slider); - } - else - { - edje_object_signal_emit(wd->slider, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->slider); - } - edje_object_part_text_set(wd->slider, "elm.text", label); - _sizing_eval(obj); + _elm_slider_label_set(obj, NULL, label); } /** @@ -584,10 +603,7 @@ EAPI const char * elm_slider_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_slider_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-07-04 09:18:10
|
Log: elm actionslider: add the elm_object_text_set/get hooks. deprecate: elm_actionslider_indicator_label_set/get, elm_actionslider_labels_set/get. Author: tasn Date: 2011-07-04 02:18:04 -0700 (Mon, 04 Jul 2011) New Revision: 60971 Trac: http://trac.enlightenment.org/e/changeset/60971 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_actionslider.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 09:08:04 UTC (rev 60970) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 09:18:04 UTC (rev 60971) @@ -4212,8 +4212,9 @@ * @param left_label The label to be set on the left. * @param center_label The label to be set on the center. * @param right_label The label to be set on the right. + * @deprecated use elm_object_text_set() instead. */ - EAPI void elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label) EINA_ARG_NONNULL(1); /** * Get actionslider labels. * @@ -4221,8 +4222,9 @@ * @param left_label A char** to place the left_label of @p obj into. * @param center_label A char** to place the center_label of @p obj into. * @param right_label A char** to place the right_label of @p obj into. + * @deprecated use elm_object_text_set() instead. */ - EAPI void elm_actionslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_actionslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label) EINA_ARG_NONNULL(1); /** * Get actionslider selected label. * @@ -4281,15 +4283,17 @@ * * @param obj The actionslider object * @param label The label to be set on the indicator. + * @deprecated use elm_object_text_set() instead. */ - EAPI void elm_actionslider_indicator_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_actionslider_indicator_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); /** * Get the label used on the indicator object. * * @param obj The actionslider object * @return The indicator label + * @deprecated use elm_object_text_set() instead. */ - EAPI const char *elm_actionslider_indicator_label_get(Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_actionslider_indicator_label_get(Evas_Object *obj) EINA_ARG_NONNULL(1); /** * @} */ Modified: trunk/elementary/src/lib/elm_actionslider.c =================================================================== --- trunk/elementary/src/lib/elm_actionslider.c 2011-07-04 09:08:04 UTC (rev 60970) +++ trunk/elementary/src/lib/elm_actionslider.c 2011-07-04 09:18:04 UTC (rev 60971) @@ -320,6 +320,77 @@ #undef _FINAL_POS_BY_ORIENTATION } +static void +_elm_actionslider_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + + if (!item) + { + eina_stringshare_replace(&wd->indicator_label, label); + edje_object_part_text_set(wd->as, "elm.text.indicator", + wd->indicator_label); + } + else if (!strcmp(item, "left")) + { + eina_stringshare_replace(&wd->text_left, label); + if (!elm_widget_mirrored_get(obj)) + { + edje_object_part_text_set(wd->as, "elm.text.left", wd->text_left); + } + else + { + edje_object_part_text_set(wd->as, "elm.text.right", wd->text_left); + } + } + else if (!strcmp(item, "center")) + { + eina_stringshare_replace(&wd->text_center, label); + edje_object_part_text_set(wd->as, "elm.text.center", wd->text_center); + } + else if (!strcmp(item, "right")) + { + eina_stringshare_replace(&wd->text_right, label); + if (!elm_widget_mirrored_get(obj)) + { + edje_object_part_text_set(wd->as, "elm.text.right", wd->text_right); + } + else + { + edje_object_part_text_set(wd->as, "elm.text.left", wd->text_right); + } + } +} + +static const char * +_elm_actionslider_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return NULL; + + if (!item) + { + return wd->indicator_label; + } + else if (!strcmp(item, "left")) + { + return wd->text_left; + } + else if (!strcmp(item, "center")) + { + return wd->text_center; + } + else if (!strcmp(item, "right")) + { + return wd->text_right; + } + + return NULL; +} + EAPI Evas_Object * elm_actionslider_add(Evas_Object *parent) { @@ -335,6 +406,8 @@ elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); + elm_widget_label_set_hook_set(obj, _elm_actionslider_label_set); + elm_widget_label_get_hook_set(obj, _elm_actionslider_label_get); wd->mouse_down = EINA_FALSE; wd->enabled_position = ELM_ACTIONSLIDER_ALL; @@ -436,20 +509,9 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - eina_stringshare_replace(&wd->text_left, left_label); - eina_stringshare_replace(&wd->text_center, center_label); - eina_stringshare_replace(&wd->text_right, right_label); - if (!elm_widget_mirrored_get(obj)) - { - edje_object_part_text_set(wd->as, "elm.text.left", wd->text_left); - edje_object_part_text_set(wd->as, "elm.text.right", wd->text_right); - } - else - { - edje_object_part_text_set(wd->as, "elm.text.left", wd->text_right); - edje_object_part_text_set(wd->as, "elm.text.right", wd->text_left); - } - edje_object_part_text_set(wd->as, "elm.text.center", center_label); + _elm_actionslider_label_set(obj, "left", left_label); + _elm_actionslider_label_set(obj, "center", center_label); + _elm_actionslider_label_set(obj, "right", right_label); } EAPI void @@ -461,9 +523,11 @@ ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (left_label) *left_label = wd->text_left; - if (center_label) *center_label = wd->text_center; - if (right_label) *right_label = wd->text_right; + if (left_label) *left_label = _elm_actionslider_label_get(obj, "left"); + if (center_label) *center_label = _elm_actionslider_label_get(obj, "center"); + + if (right_label) *right_label = _elm_actionslider_label_get(obj, "right"); + } EAPI const char * @@ -491,19 +555,11 @@ EAPI void elm_actionslider_indicator_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - eina_stringshare_replace(&wd->indicator_label, label); - edje_object_part_text_set(wd->as, "elm.text.indicator", wd->indicator_label); + _elm_actionslider_label_set(obj, NULL, label); } EAPI const char * elm_actionslider_indicator_label_get(Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->indicator_label; + return _elm_actionslider_label_get(obj, NULL); } |
From: Enlightenment S. <no-...@en...> - 2011-07-04 09:18:16
|
Log: elm check: add the elm_object_text_set/get hooks. deprecate: elm_check_indicator_label_set/get. Author: tasn Date: 2011-07-04 02:18:10 -0700 (Mon, 04 Jul 2011) New Revision: 60973 Trac: http://trac.enlightenment.org/e/changeset/60973 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_check.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 09:18:07 UTC (rev 60972) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 09:18:10 UTC (rev 60973) @@ -4498,8 +4498,8 @@ /* check */ EAPI Evas_Object *elm_check_add(Evas_Object *parent) EINA_ARG_NONNULL(1); - EAPI void elm_check_label_set(Evas_Object *obj, const char *label); EINA_ARG_NONNULL(1) - EAPI const char *elm_check_label_get(const Evas_Object *obj); EINA_ARG_NONNULL(1) + EINA_DEPRECATED EAPI void elm_check_label_set(Evas_Object *obj, const char *label); EINA_ARG_NONNULL(1) + EINA_DEPRECATED EAPI const char *elm_check_label_get(const Evas_Object *obj); EINA_ARG_NONNULL(1) EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon); EINA_ARG_NONNULL(1) EAPI Evas_Object *elm_check_icon_get(const Evas_Object *obj); EINA_ARG_NONNULL(1) EAPI Evas_Object *elm_check_icon_unset(Evas_Object *obj); EINA_ARG_NONNULL(1) Modified: trunk/elementary/src/lib/elm_check.c =================================================================== --- trunk/elementary/src/lib/elm_check.c 2011-07-04 09:18:07 UTC (rev 60972) +++ trunk/elementary/src/lib/elm_check.c 2011-07-04 09:18:10 UTC (rev 60973) @@ -231,6 +231,33 @@ evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); } +static void +_elm_check_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + eina_stringshare_replace(&wd->label, label); + if (label) + edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm"); + else + edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->chk); + edje_object_part_text_set(wd->chk, "elm.text", label); + _sizing_eval(obj); +} + +static const char * +_elm_check_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return wd->label; +} + /** * Add a new Check object * @@ -259,6 +286,8 @@ elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_activate_hook_set(obj, _activate_hook); elm_widget_event_hook_set(obj, _event_hook); + elm_widget_label_set_hook_set(obj, _elm_check_label_set); + elm_widget_label_get_hook_set(obj, _elm_check_label_get); wd->chk = edje_object_add(e); _elm_theme_object_set(obj, wd->chk, "check", "base", "default"); @@ -292,17 +321,7 @@ EAPI void elm_check_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->label, label); - if (label) - edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm"); - else - edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->chk); - edje_object_part_text_set(wd->chk, "elm.text", label); - _sizing_eval(obj); + _elm_check_label_set(obj, NULL, label); } /** @@ -316,10 +335,7 @@ EAPI const char * elm_check_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_check_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:13:46
|
Log: Elm check: Add deprecation notice to doxygen. Author: tasn Date: 2011-07-04 03:13:39 -0700 (Mon, 04 Jul 2011) New Revision: 60985 Trac: http://trac.enlightenment.org/e/changeset/60985 Modified: trunk/elementary/src/lib/elm_check.c Modified: trunk/elementary/src/lib/elm_check.c =================================================================== --- trunk/elementary/src/lib/elm_check.c 2011-07-04 09:59:49 UTC (rev 60984) +++ trunk/elementary/src/lib/elm_check.c 2011-07-04 10:13:39 UTC (rev 60985) @@ -317,6 +317,7 @@ * @param label The text label string in UTF-8 * * @ingroup Check + * @deprecated use elm_object_text_set() instead. */ EAPI void elm_check_label_set(Evas_Object *obj, const char *label) @@ -331,6 +332,7 @@ * @return The text label string in UTF-8 * * @ingroup Check + * @deprecated use elm_object_text_set() instead. */ EAPI const char * elm_check_label_get(const Evas_Object *obj) |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:13:50
|
Log: elm radio: add the elm_object_text_set/get hooks. deprecate: elm_radio_indicator_label_set/get. Author: tasn Date: 2011-07-04 03:13:43 -0700 (Mon, 04 Jul 2011) New Revision: 60986 Trac: http://trac.enlightenment.org/e/changeset/60986 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_radio.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:13:39 UTC (rev 60985) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:13:43 UTC (rev 60986) @@ -4512,8 +4512,8 @@ /* radio */ EAPI Evas_Object *elm_radio_add(Evas_Object *parent) EINA_ARG_NONNULL(1); - EAPI void elm_radio_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - EAPI const char *elm_radio_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_radio_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_radio_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_radio_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_radio_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elm_radio.c =================================================================== --- trunk/elementary/src/lib/elm_radio.c 2011-07-04 10:13:39 UTC (rev 60985) +++ trunk/elementary/src/lib/elm_radio.c 2011-07-04 10:13:43 UTC (rev 60986) @@ -273,6 +273,38 @@ _activate(data); } +static void +_elm_radio_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + eina_stringshare_replace(&wd->label, label); + if (label) + { + edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm"); + edje_object_message_signal_process(wd->radio); + } + else + { + edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->radio); + } + edje_object_part_text_set(wd->radio, "elm.text", label); + _sizing_eval(obj); +} + +static const char * +_elm_radio_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return wd->label; +} + /** * Add a new radio to the parent * @@ -301,6 +333,8 @@ elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_activate_hook_set(obj, _activate_hook); elm_widget_event_hook_set(obj, _event_hook); + elm_widget_text_set_hook_set(obj, _elm_radio_label_set); + elm_widget_text_get_hook_set(obj, _elm_radio_label_get); wd->radio = edje_object_add(e); _elm_theme_object_set(obj, wd->radio, "radio", "base", "default"); @@ -330,26 +364,12 @@ * @param label The text label string in UTF-8 * * @ingroup Radio + * @deprecated use elm_object_text_set() instead. */ EAPI void elm_radio_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->label, label); - if (label) - { - edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->radio); - } - else - { - edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->radio); - } - edje_object_part_text_set(wd->radio, "elm.text", label); - _sizing_eval(obj); + _elm_radio_label_set(obj, NULL, label); } /** @@ -359,14 +379,12 @@ * @return The text label string in UTF-8 * * @ingroup Radio + * @deprecated use elm_object_text_set() instead. */ EAPI const char * elm_radio_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_radio_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:13:54
|
Log: elm progressbar: add the elm_object_text_set/get hooks. deprecate: elm_progressbar_indicator_label_set/get. Author: tasn Date: 2011-07-04 03:13:53 -0700 (Mon, 04 Jul 2011) New Revision: 60989 Trac: http://trac.enlightenment.org/e/changeset/60989 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_progressbar.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:13:50 UTC (rev 60988) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:13:53 UTC (rev 60989) @@ -4627,8 +4627,8 @@ EAPI void elm_progressbar_pulse(Evas_Object *obj, Eina_Bool state) EINA_ARG_NONNULL(1); EAPI void elm_progressbar_value_set(Evas_Object *obj, double val) EINA_ARG_NONNULL(1); EAPI double elm_progressbar_value_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - EAPI void elm_progressbar_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - EAPI const char *elm_progressbar_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_progressbar_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_progressbar_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_progressbar_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_progressbar_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_progressbar_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elm_progressbar.c =================================================================== --- trunk/elementary/src/lib/elm_progressbar.c 2011-07-04 10:13:50 UTC (rev 60988) +++ trunk/elementary/src/lib/elm_progressbar.c 2011-07-04 10:13:53 UTC (rev 60989) @@ -187,6 +187,38 @@ edje_object_part_text_set(wd->progressbar, "elm.text.status", NULL); } +static void +_elm_progressbar_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + eina_stringshare_replace(&wd->label, label); + if (label) + { + edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm"); + edje_object_message_signal_process(wd->progressbar); + } + else + { + edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->progressbar); + } + edje_object_part_text_set(wd->progressbar, "elm.text", label); + _sizing_eval(obj); +} + +static const char * +_elm_progressbar_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return wd->label; +} + /** * Add a new progressbar to the parent * @@ -211,6 +243,8 @@ elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_FALSE); + elm_widget_text_set_hook_set(obj, _elm_progressbar_label_set); + elm_widget_text_get_hook_set(obj, _elm_progressbar_label_get); wd->horizontal = EINA_TRUE; wd->inverted = EINA_FALSE; @@ -349,26 +383,12 @@ * @param label The text label string in UTF-8 * * @ingroup Progressbar + * @deprecated use elm_object_text_set() instead. */ EAPI void elm_progressbar_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->label, label); - if (label) - { - edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->progressbar); - } - else - { - edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->progressbar); - } - edje_object_part_text_set(wd->progressbar, "elm.text", label); - _sizing_eval(obj); + _elm_progressbar_label_set(obj, NULL, label); } /** @@ -378,14 +398,12 @@ * @return The text label string in UTF-8 * * @ingroup Progressbar + * @deprecated use elm_object_text_set() instead. */ EAPI const char * elm_progressbar_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_progressbar_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:14:05
|
Log: elm fileselector_button: add the elm_object_text_set/get hooks. deprecate: elm_fileselector_button_indicator_label_set/get. Author: tasn Date: 2011-07-04 03:13:59 -0700 (Mon, 04 Jul 2011) New Revision: 60991 Trac: http://trac.enlightenment.org/e/changeset/60991 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elc_fileselector_button.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:13:56 UTC (rev 60990) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:13:59 UTC (rev 60991) @@ -2523,8 +2523,8 @@ /* fileselector */ EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent) EINA_ARG_NONNULL(1); - EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_fileselector_button_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_fileselector_button_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_fileselector_button_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elc_fileselector_button.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_button.c 2011-07-04 10:13:56 UTC (rev 60990) +++ trunk/elementary/src/lib/elc_fileselector_button.c 2011-07-04 10:13:59 UTC (rev 60991) @@ -254,6 +254,27 @@ (void *)wd->fsd.path); } +static void +_elm_fileselector_button_label_set(Evas_Object *obj, const char *item, + const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + if (item) return; + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + elm_object_text_set(wd->btn, label); +} + +static const char * +_elm_fileselector_button_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return elm_object_text_get(wd->btn); +} + /** * Add a new file selector button into the parent object. * @@ -281,6 +302,8 @@ elm_widget_disable_hook_set(obj, _disable_hook); elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_activate_hook_set(obj, _activate_hook); + elm_widget_text_set_hook_set(obj, _elm_fileselector_button_label_set); + elm_widget_text_get_hook_set(obj, _elm_fileselector_button_label_get); wd->self = obj; wd->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE); @@ -311,15 +334,13 @@ * @param label The text label text to be displayed on the button * * @ingroup File_Selector_Button + * @deprecated use elm_object_text_set() instead. */ EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_object_text_set(wd->btn, label); + _elm_fileselector_button_label_set(obj, NULL, label); } /** @@ -329,14 +350,12 @@ * @return The button label * * @ingroup File_Selector_Button + * @deprecated use elm_object_text_set() instead. */ EAPI const char * elm_fileselector_button_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return elm_object_text_get(wd->btn); + return _elm_fileselector_button_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:14:11
|
Log: elm fileselector_button_entry: add the elm_object_text_set/get hooks. deprecate: elm_fileselector_button_entry_indicator_label_set/get. Author: tasn Date: 2011-07-04 03:14:05 -0700 (Mon, 04 Jul 2011) New Revision: 60993 Trac: http://trac.enlightenment.org/e/changeset/60993 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elc_fileselector_entry.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:14:02 UTC (rev 60992) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:14:05 UTC (rev 60993) @@ -2554,8 +2554,8 @@ */ EAPI Evas_Object *elm_fileselector_entry_add(Evas_Object *parent) EINA_ARG_NONNULL(1); - EAPI void elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - EAPI const char *elm_fileselector_entry_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_fileselector_entry_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_fileselector_entry_button_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_fileselector_entry_button_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_fileselector_entry_button_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elc_fileselector_entry.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_entry.c 2011-07-04 10:14:02 UTC (rev 60992) +++ trunk/elementary/src/lib/elc_fileselector_entry.c 2011-07-04 10:14:05 UTC (rev 60993) @@ -212,6 +212,26 @@ _sizing_eval(data); } +static void +_elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + elm_object_text_set(wd->button, label); +} + +static const char * +_elm_fileselector_entry_button_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return elm_object_text_get(wd->button); +} + /** * Add a new file selector entry into the parent object. * @@ -238,6 +258,8 @@ elm_widget_focus_next_hook_set(obj, _elm_fileselector_entry_focus_next_hook); elm_widget_can_focus_set(obj, EINA_FALSE); elm_widget_theme_hook_set(obj, _theme_hook); + elm_widget_text_set_hook_set(obj, _elm_fileselector_entry_button_label_set); + elm_widget_text_get_hook_set(obj, _elm_fileselector_entry_button_label_get); wd->edje = edje_object_add(e); _elm_theme_object_set(obj, wd->edje, "fileselector_entry", "base", "default"); @@ -303,23 +325,18 @@ * @param label The text label text to be displayed on the entry * * @ingroup File_Selector_Entry + * @deprecated use elm_object_text_set() instead. */ EAPI void elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_object_text_set(wd->button, label); + _elm_fileselector_entry_button_label_set(obj, NULL, label); } EAPI const char * elm_fileselector_entry_button_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return elm_object_text_get(wd->button); + return _elm_fileselector_entry_button_label_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:14:12
|
Log: elm bubble: add the elm_object_text_set/get hooks. deprecate: elm_bubble_indicator_label_set/get. Author: tasn Date: 2011-07-04 03:14:11 -0700 (Mon, 04 Jul 2011) New Revision: 60995 Trac: http://trac.enlightenment.org/e/changeset/60995 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_bubble.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:14:08 UTC (rev 60994) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:14:11 UTC (rev 60995) @@ -3716,8 +3716,9 @@ * * This function sets the title of the bubble. Where this appears depends on * the selected corner. + * @deprecated use elm_object_text_set() instead. */ - EAPI void elm_bubble_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_bubble_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); /** * Get the label of the bubble * @@ -3725,8 +3726,9 @@ * @return The string of set in the label * * This function gets the title of the bubble. + * @deprecated use elm_object_text_set() instead. */ - EAPI const char *elm_bubble_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_bubble_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Set the info of the bubble * @@ -3735,8 +3737,9 @@ * * This function sets the info of the bubble. Where this appears depends on * the selected corner. + * @deprecated use elm_object_text_set() instead. */ - EAPI void elm_bubble_info_set(Evas_Object *obj, const char *info) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_bubble_info_set(Evas_Object *obj, const char *info) EINA_ARG_NONNULL(1); /** * Get the info of the bubble * @@ -3745,8 +3748,9 @@ * @return The "info" string of the bubble * * This function gets the info text. + * @deprecated use elm_object_text_set() instead. */ - EAPI const char *elm_bubble_info_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_bubble_info_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Set the content to be shown in the bubble * Modified: trunk/elementary/src/lib/elm_bubble.c =================================================================== --- trunk/elementary/src/lib/elm_bubble.c 2011-07-04 10:14:08 UTC (rev 60994) +++ trunk/elementary/src/lib/elm_bubble.c 2011-07-04 10:14:11 UTC (rev 60995) @@ -136,6 +136,52 @@ evas_object_smart_callback_call(data, SIG_CLICKED, NULL); } +static void +_elm_bubble_label_set(Evas_Object *obj, const char *item, const char *label) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + + if (!item) + { + eina_stringshare_replace(&wd->label, label); + edje_object_part_text_set(wd->bbl, "elm.text", label); + if (label) edje_object_signal_emit(wd->bbl, "elm,state,text,visible", + "elm"); + else edje_object_signal_emit(wd->bbl, "elm,state,text,hidden", "elm"); + _sizing_eval(obj); + } + else if (!strcmp(item, "info")) + { + eina_stringshare_replace(&wd->info, label); + edje_object_part_text_set(wd->bbl, "elm.info", label); + if (label) edje_object_signal_emit(wd->bbl, "elm,state,info,visible", + "elm"); + else edje_object_signal_emit(wd->bbl, "elm,state,info,hidden", "elm"); + _sizing_eval(obj); + } +} + +static const char* +_elm_bubble_label_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return NULL; + + if (!item) + { + return wd->label; + } + else if (!strcmp(item, "info")) + { + return wd->info; + } + + return NULL; +} + EAPI Evas_Object * elm_bubble_add(Evas_Object *parent) { @@ -153,6 +199,8 @@ elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_focus_next_hook_set(obj, _elm_bubble_focus_next_hook); elm_widget_can_focus_set(obj, EINA_FALSE); + elm_widget_text_set_hook_set(obj, _elm_bubble_label_set); + elm_widget_text_get_hook_set(obj, _elm_bubble_label_get); wd->corner = eina_stringshare_add("base"); @@ -174,45 +222,25 @@ EAPI void elm_bubble_label_set(Evas_Object *obj, const char *label) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->label, label); - edje_object_part_text_set(wd->bbl, "elm.text", label); - if (label) edje_object_signal_emit(wd->bbl, "elm,state,text,visible", "elm"); - else edje_object_signal_emit(wd->bbl, "elm,state,text,hidden", "elm"); - _sizing_eval(obj); + _elm_bubble_label_set(obj, NULL, label); } EAPI const char* elm_bubble_label_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->label; + return _elm_bubble_label_get(obj, NULL); } EAPI void elm_bubble_info_set(Evas_Object *obj, const char *info) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - eina_stringshare_replace(&wd->info, info); - edje_object_part_text_set(wd->bbl, "elm.info", info); - if (info) edje_object_signal_emit(wd->bbl, "elm,state,info,visible", "elm"); - else edje_object_signal_emit(wd->bbl, "elm,state,info,hidden", "elm"); - _sizing_eval(obj); + _elm_bubble_label_set(obj, "info", info); } EAPI const char * elm_bubble_info_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->info; + return _elm_bubble_label_get(obj, "info"); } EAPI void |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:40:04
|
Log: elm anchorview: add the elm_object_text_set/get hooks. deprecate: elm_anchorview_text_set/get. Author: tasn Date: 2011-07-04 03:39:58 -0700 (Mon, 04 Jul 2011) New Revision: 60997 Trac: http://trac.enlightenment.org/e/changeset/60997 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elc_anchorview.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:14:14 UTC (rev 60996) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:39:58 UTC (rev 60997) @@ -3211,8 +3211,9 @@ * * 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. */ - EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); /** * Get the markup text set for the anchorview * @@ -3221,8 +3222,9 @@ * @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. */ - EAPI const char *elm_anchorview_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_anchorview_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Set the parent of the hover popup * Modified: trunk/elementary/src/lib/elc_anchorview.c =================================================================== --- trunk/elementary/src/lib/elc_anchorview.c 2011-07-04 10:14:14 UTC (rev 60996) +++ trunk/elementary/src/lib/elc_anchorview.c 2011-07-04 10:39:58 UTC (rev 60997) @@ -175,6 +175,31 @@ return NULL; } +static void +_elm_anchorview_text_set(Evas_Object *obj, const char *item, const char *text) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + elm_entry_entry_set(wd->entry, text); + if (wd->hover) evas_object_del(wd->hover); + if (wd->pop) evas_object_del(wd->pop); + wd->hover = NULL; + wd->pop = NULL; + _sizing_eval(obj); +} + +static const char* +_elm_anchorview_text_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return elm_entry_entry_get(wd->entry); +} + EAPI Evas_Object * elm_anchorview_add(Evas_Object *parent) { @@ -192,6 +217,8 @@ elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_TRUE); + elm_widget_text_set_hook_set(obj, _elm_anchorview_text_set); + elm_widget_text_get_hook_set(obj, _elm_anchorview_text_get); wd->scroller = elm_scroller_add(parent); elm_widget_resize_object_set(obj, wd->scroller); @@ -223,24 +250,13 @@ EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_entry_entry_set(wd->entry, text); - if (wd->hover) evas_object_del(wd->hover); - if (wd->pop) evas_object_del(wd->pop); - wd->hover = NULL; - wd->pop = NULL; - _sizing_eval(obj); + _elm_anchorview_text_set(obj, NULL, text); } EAPI const char* elm_anchorview_text_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return elm_entry_entry_get(wd->entry); + return _elm_anchorview_text_get(obj, NULL); } EAPI void |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:40:13
|
Log: elm anchorblock: add the elm_object_text_set/get hooks. deprecate: elm_anchorblock_text_set/get. Author: tasn Date: 2011-07-04 03:40:07 -0700 (Mon, 04 Jul 2011) New Revision: 60999 Trac: http://trac.enlightenment.org/e/changeset/60999 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elc_anchorblock.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:40:02 UTC (rev 60998) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-04 10:40:07 UTC (rev 60999) @@ -3555,8 +3555,9 @@ * * 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. */ - EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); /** * Get the markup text set for the anchorblock * @@ -3565,8 +3566,9 @@ * @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. */ - EAPI const char *elm_anchorblock_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI const char *elm_anchorblock_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Set the parent of the hover popup * Modified: trunk/elementary/src/lib/elc_anchorblock.c =================================================================== --- trunk/elementary/src/lib/elc_anchorblock.c 2011-07-04 10:40:02 UTC (rev 60998) +++ trunk/elementary/src/lib/elc_anchorblock.c 2011-07-04 10:40:07 UTC (rev 60999) @@ -181,6 +181,31 @@ return NULL; } +static void +_elm_anchorblock_text_set(Evas_Object *obj, const char *item, const char *text) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return; + if (!wd) return; + elm_entry_entry_set(wd->entry, text); + if (wd->hover) evas_object_del(wd->hover); + if (wd->pop) evas_object_del(wd->pop); + wd->hover = NULL; + wd->pop = NULL; + _sizing_eval(obj); +} + +static const char* +_elm_anchorblock_text_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + if (!wd) return NULL; + return elm_entry_entry_get(wd->entry); +} + EAPI Evas_Object * elm_anchorblock_add(Evas_Object *parent) { @@ -198,6 +223,8 @@ elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_TRUE); + elm_widget_text_set_hook_set(obj, _elm_anchorblock_text_set); + elm_widget_text_get_hook_set(obj, _elm_anchorblock_text_get); wd->entry = elm_entry_add(parent); elm_entry_item_provider_prepend(wd->entry, _item_provider, obj); @@ -226,24 +253,13 @@ EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_entry_entry_set(wd->entry, text); - if (wd->hover) evas_object_del(wd->hover); - if (wd->pop) evas_object_del(wd->pop); - wd->hover = NULL; - wd->pop = NULL; - _sizing_eval(obj); + _elm_anchorblock_text_set(obj, NULL, text); } EAPI const char* elm_anchorblock_text_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return elm_entry_entry_get(wd->entry); + return _elm_anchorblock_text_get(obj, NULL); } EAPI void |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:40:19
|
Log: elm entry: add the elm_object_text_set/get hooks. Author: tasn Date: 2011-07-04 03:40:13 -0700 (Mon, 04 Jul 2011) New Revision: 61001 Trac: http://trac.enlightenment.org/e/changeset/61001 Modified: trunk/elementary/src/lib/elm_entry.c Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-07-04 10:40:10 UTC (rev 61000) +++ trunk/elementary/src/lib/elm_entry.c 2011-07-04 10:40:13 UTC (rev 61001) @@ -1856,6 +1856,70 @@ evas_object_smart_callback_call(obj, "maxlength,reached", NULL); } +static void +_elm_entry_text_set(Evas_Object *obj, const char *item, const char *entry) +{ + int len = 0; + ELM_CHECK_WIDTYPE(obj, widtype); + if (item) return; + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + if (!entry) entry = ""; + if (wd->text) eina_stringshare_del(wd->text); + wd->text = NULL; + wd->changed = EINA_TRUE; + + /* Clear currently pending job if there is one */ + if (wd->append_text_idler) + { + ecore_idler_del(wd->append_text_idler); + free(wd->append_text_left); + wd->append_text_left = NULL; + wd->append_text_idler = NULL; + } + + len = strlen(entry); + /* Split to ~_CHUNK_SIZE chunks */ + if (len > _CHUNK_SIZE) + { + wd->append_text_left = (char *) malloc(len + 1); + } + + /* If we decided to use the idler */ + if (wd->append_text_left) + { + /* Need to clear the entry first */ + edje_object_part_text_set(wd->ent, "elm.text", ""); + memcpy(wd->append_text_left, entry, len + 1); + wd->append_text_position = 0; + wd->append_text_len = len; + wd->append_text_idler = ecore_idler_add(_text_append_idler, obj); + } + else + { + edje_object_part_text_set(wd->ent, "elm.text", entry); + } +} + +static const char * +_elm_entry_text_get(const Evas_Object *obj, const char *item) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + if (item) return NULL; + const char *text; + if (!wd) return NULL; + if (wd->text) return wd->text; + text = edje_object_part_text_get(wd->ent, "elm.text"); + if (!text) + { + ERR("text=NULL for edje %p, part 'elm.text'", wd->ent); + return NULL; + } + eina_stringshare_replace(&wd->text, text); + return wd->text; +} + /** * This adds an entry to @p parent object. * @@ -1890,6 +1954,8 @@ elm_object_cursor_set(obj, ELM_CURSOR_XTERM); elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_highlight_ignore_set(obj, EINA_TRUE); + elm_widget_text_set_hook_set(obj, _elm_entry_text_set); + elm_widget_text_get_hook_set(obj, _elm_entry_text_get); wd->scroller = elm_smart_scroller_add(e); elm_widget_sub_object_add(obj, wd->scroller); @@ -2110,45 +2176,7 @@ EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry) { - int len = 0; - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (!entry) entry = ""; - if (wd->text) eina_stringshare_del(wd->text); - wd->text = NULL; - wd->changed = EINA_TRUE; - - /* Clear currently pending job if there is one */ - if (wd->append_text_idler) - { - ecore_idler_del(wd->append_text_idler); - free(wd->append_text_left); - wd->append_text_left = NULL; - wd->append_text_idler = NULL; - } - - len = strlen(entry); - /* Split to ~_CHUNK_SIZE chunks */ - if (len > _CHUNK_SIZE) - { - wd->append_text_left = (char *) malloc(len + 1); - } - - /* If we decided to use the idler */ - if (wd->append_text_left) - { - /* Need to clear the entry first */ - edje_object_part_text_set(wd->ent, "elm.text", ""); - memcpy(wd->append_text_left, entry, len + 1); - wd->append_text_position = 0; - wd->append_text_len = len; - wd->append_text_idler = ecore_idler_add(_text_append_idler, obj); - } - else - { - edje_object_part_text_set(wd->ent, "elm.text", entry); - } + _elm_entry_text_set(obj, NULL, entry); } /** @@ -2202,19 +2230,7 @@ EAPI const char * elm_entry_entry_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - const char *text; - if (!wd) return NULL; - if (wd->text) return wd->text; - text = edje_object_part_text_get(wd->ent, "elm.text"); - if (!text) - { - ERR("text=NULL for edje %p, part 'elm.text'", wd->ent); - return NULL; - } - eina_stringshare_replace(&wd->text, text); - return wd->text; + return _elm_entry_text_get(obj, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-07-04 10:52:30
|
Log: Elm: Make all the widgets accept "default" as the default. Author: tasn Date: 2011-07-04 03:52:23 -0700 (Mon, 04 Jul 2011) New Revision: 61002 Trac: http://trac.enlightenment.org/e/changeset/61002 Modified: trunk/elementary/src/lib/elc_anchorblock.c trunk/elementary/src/lib/elc_anchorview.c trunk/elementary/src/lib/elc_fileselector_button.c trunk/elementary/src/lib/elc_fileselector_entry.c trunk/elementary/src/lib/elc_hoversel.c trunk/elementary/src/lib/elm_actionslider.c trunk/elementary/src/lib/elm_bubble.c trunk/elementary/src/lib/elm_button.c trunk/elementary/src/lib/elm_check.c trunk/elementary/src/lib/elm_entry.c trunk/elementary/src/lib/elm_frame.c trunk/elementary/src/lib/elm_label.c trunk/elementary/src/lib/elm_progressbar.c trunk/elementary/src/lib/elm_radio.c trunk/elementary/src/lib/elm_slider.c trunk/elementary/src/lib/elm_toggle.c Modified: trunk/elementary/src/lib/elc_anchorblock.c =================================================================== --- trunk/elementary/src/lib/elc_anchorblock.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elc_anchorblock.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -186,7 +186,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; elm_entry_entry_set(wd->entry, text); if (wd->hover) evas_object_del(wd->hover); @@ -201,7 +201,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return elm_entry_entry_get(wd->entry); } Modified: trunk/elementary/src/lib/elc_anchorview.c =================================================================== --- trunk/elementary/src/lib/elc_anchorview.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elc_anchorview.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -180,7 +180,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; elm_entry_entry_set(wd->entry, text); if (wd->hover) evas_object_del(wd->hover); @@ -195,7 +195,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return elm_entry_entry_get(wd->entry); } Modified: trunk/elementary/src/lib/elc_fileselector_button.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_button.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elc_fileselector_button.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -259,7 +259,7 @@ const char *label) { ELM_CHECK_WIDTYPE(obj, widtype); - if (item) return; + if (item && strcmp(item, "default")) return; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; elm_object_text_set(wd->btn, label); @@ -270,7 +270,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return elm_object_text_get(wd->btn); } Modified: trunk/elementary/src/lib/elc_fileselector_entry.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_entry.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elc_fileselector_entry.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -217,7 +217,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; elm_object_text_set(wd->button, label); } @@ -227,7 +227,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return elm_object_text_get(wd->button); } Modified: trunk/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/elementary/src/lib/elc_hoversel.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elc_hoversel.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -272,7 +272,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; elm_object_text_set(wd->btn, label); } @@ -282,7 +282,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if ((!wd) || (!wd->btn)) return NULL; return elm_object_text_get(wd->btn); } Modified: trunk/elementary/src/lib/elm_actionslider.c =================================================================== --- trunk/elementary/src/lib/elm_actionslider.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_actionslider.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -327,7 +327,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (!item) + if (!item || !strcmp(item, "default")) { eina_stringshare_replace(&wd->indicator_label, label); edje_object_part_text_set(wd->as, "elm.text.indicator", @@ -371,7 +371,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - if (!item) + if (!item || !strcmp(item, "default")) { return wd->indicator_label; } Modified: trunk/elementary/src/lib/elm_bubble.c =================================================================== --- trunk/elementary/src/lib/elm_bubble.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_bubble.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -143,7 +143,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (!item) + if (!item || !strcmp(item, "default")) { eina_stringshare_replace(&wd->label, label); edje_object_part_text_set(wd->bbl, "elm.text", label); @@ -170,7 +170,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - if (!item) + if (!item || !strcmp(item, "default")) { return wd->label; } Modified: trunk/elementary/src/lib/elm_button.c =================================================================== --- trunk/elementary/src/lib/elm_button.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_button.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -294,7 +294,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; eina_stringshare_replace(&wd->label, label); if (label) @@ -311,7 +311,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } Modified: trunk/elementary/src/lib/elm_check.c =================================================================== --- trunk/elementary/src/lib/elm_check.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_check.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -236,7 +236,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; eina_stringshare_replace(&wd->label, label); if (label) @@ -253,7 +253,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_entry.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -1861,7 +1861,7 @@ { int len = 0; ELM_CHECK_WIDTYPE(obj, widtype); - if (item) return; + if (item && strcmp(item, "default")) return; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; if (!entry) entry = ""; @@ -1906,7 +1906,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; const char *text; if (!wd) return NULL; if (wd->text) return wd->text; Modified: trunk/elementary/src/lib/elm_frame.c =================================================================== --- trunk/elementary/src/lib/elm_frame.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_frame.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -114,7 +114,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; eina_stringshare_replace(&(wd->label), label); edje_object_part_text_set(wd->frm, "elm.text", wd->label); @@ -126,7 +126,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } Modified: trunk/elementary/src/lib/elm_label.c =================================================================== --- trunk/elementary/src/lib/elm_label.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_label.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -521,7 +521,7 @@ ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (item) return; + if (item && strcmp(item, "default")) return; if (!label) label = ""; eina_stringshare_replace(&wd->label, label); edje_object_part_text_set(wd->lbl, "elm.text", wd->format); @@ -535,7 +535,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } Modified: trunk/elementary/src/lib/elm_progressbar.c =================================================================== --- trunk/elementary/src/lib/elm_progressbar.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_progressbar.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -192,7 +192,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; eina_stringshare_replace(&wd->label, label); if (label) @@ -214,7 +214,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } Modified: trunk/elementary/src/lib/elm_radio.c =================================================================== --- trunk/elementary/src/lib/elm_radio.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_radio.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -278,7 +278,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; eina_stringshare_replace(&wd->label, label); if (label) @@ -300,7 +300,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } Modified: trunk/elementary/src/lib/elm_slider.c =================================================================== --- trunk/elementary/src/lib/elm_slider.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_slider.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -487,7 +487,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; eina_stringshare_replace(&wd->label, label); if (label) @@ -509,7 +509,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } Modified: trunk/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/elementary/src/lib/elm_toggle.c 2011-07-04 10:40:13 UTC (rev 61001) +++ trunk/elementary/src/lib/elm_toggle.c 2011-07-04 10:52:23 UTC (rev 61002) @@ -206,7 +206,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (item) return; + if (item && strcmp(item, "default")) return; if (!wd) return; eina_stringshare_replace(&wd->label, label); if (label) @@ -223,7 +223,7 @@ { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (item) return NULL; + if (item && strcmp(item, "default")) return NULL; if (!wd) return NULL; return wd->label; } |
From: Enlightenment S. <no-...@en...> - 2011-07-06 11:17:08
|
Log: Elm animator: Apparently this is deprecated, update docs accordingly. Hermet told me this is depercated and Transit should be used instead. Anyhow, the functions were only marked as deprecated with the warning macro and not in docs, fixed that. Author: tasn Date: 2011-07-06 04:17:01 -0700 (Wed, 06 Jul 2011) New Revision: 61082 Trac: http://trac.enlightenment.org/e/changeset/61082 Modified: trunk/elementary/src/lib/Elementary.h.in Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-06 10:54:30 UTC (rev 61081) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-06 11:17:01 UTC (rev 61082) @@ -5203,6 +5203,7 @@ * The @a parent argument can be set to NULL for no parent. If a parent is set * there is no need to call elm_animator_del(), when the parent is deleted it * will delete the animator. + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI Elm_Animator* elm_animator_add(Evas_Object *parent); /** @@ -5211,6 +5212,7 @@ * automatically called when the parent is deleted. * * @param[in] animator Animator object + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_del(Elm_Animator *animator) EINA_ARG_NONNULL(1); /** @@ -5218,6 +5220,7 @@ * * @param[in] animator Animator object * @param[in] duration Duration in second + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_duration_set(Elm_Animator *animator, double duration) EINA_ARG_NONNULL(1); /** @@ -5230,6 +5233,7 @@ * The @p func callback will be called with a frame value in range [0, 1] which * indicates how far along the animation should be. It is the job of @p func to * actually change the state of any object(or objects) that are being animated. + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_operation_callback_set(Elm_Animator *animator, Elm_Animator_Operation_Cb func, void *data) EINA_ARG_NONNULL(1); /** @@ -5240,6 +5244,7 @@ * @param[in] data Callback function user argument * * @warning @a func will not be executed if elm_animator_stop() is called. + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_completion_callback_set(Elm_Animator *animator, Elm_Animator_Completion_Cb func, void *data) EINA_ARG_NONNULL(1); /** @@ -5251,6 +5256,7 @@ * animation in progress the animation will be stopped(the operation callback * will not be executed again) and it can't be restarted using * elm_animator_resume(). + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_stop(Elm_Animator *animator) EINA_ARG_NONNULL(1); /** @@ -5258,6 +5264,7 @@ * * @param[in] animator Animator object * @param[in] repeat_cnt Repeat count + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt) EINA_ARG_NONNULL(1); /** @@ -5268,6 +5275,7 @@ * This function starts the animation if the nescessary properties(duration * and operation callback) have been set. Once started the animation will * run until complete or elm_animator_stop() is called. + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_animate(Elm_Animator *animator) EINA_ARG_NONNULL(1); /** @@ -5275,6 +5283,7 @@ * * @param[in] animator Animator object * @param[in] cs Curve style. Default is ELM_ANIMATOR_CURVE_LINEAR + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_curve_style_set(Elm_Animator *animator, Elm_Animator_Curve_Style cs) EINA_ARG_NONNULL(1); /** @@ -5282,6 +5291,7 @@ * * @param[in] animator Animator object * @param[in] cs Curve style. Default is ELM_ANIMATOR_CURVE_LINEAR + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI Elm_Animator_Curve_Style elm_animator_curve_style_get(const Elm_Animator *animator); EINA_ARG_NONNULL(1); /** @@ -5295,12 +5305,14 @@ * will run in reverse once for each time it ran forward.@n * Runnin an animation in reverse is accomplished by calling the operation * callback with a frame value starting at 1 and diminshing until 0. + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse) EINA_ARG_NONNULL(1); /** * Gets wether the animation will automatically reversed * * @param[in] animator Animator object + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI Eina_Bool elm_animator_auto_reverse_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1); /** @@ -5310,12 +5322,14 @@ * or through elm_animator_stop()). * * @param[in] animator Animator object + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI Eina_Bool elm_animator_operating_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1); /** * Gets how many times the animation will be repeated * * @param[in] animator Animator object + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI unsigned int elm_animator_repeat_get(const Elm_Animator *animator) EINA_ARG_NONNULL(1); /** @@ -5327,6 +5341,7 @@ * will not be called). If the animation is not yet running this is a no-op. * Once an animation has been paused with this function it can be resumed * using elm_animator_resume(). + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_pause(Elm_Animator *animator) EINA_ARG_NONNULL(1); /** @@ -5344,6 +5359,7 @@ * animation with a duration of 3 seconds is paused after 1 second for 1 second * it will resume as if it had ben animating for 2 seconds, the operating * callback will be called with a frame value of aproximately 2/3. + * @deprecated Use @ref Transit instead. */ EINA_DEPRECATED EAPI void elm_animator_resume(Elm_Animator *animator) EINA_ARG_NONNULL(1); /** |
From: Enlightenment S. <no-...@en...> - 2011-07-07 14:41:13
|
Log: Elm gesture_layer: Added gesture layer widget. Gesture layer allows detection of gestures and essentially gives the user a unified way of getting "complex" input. It doesn't do (by design) complex gestures like "V" or "S", instead it does simple and fast interaction gestures like: 2-finger pinch/rotate/lines or CTRL+Mouse_Wheel zoom and etc. This lets people to write an application/widget regardless of the input device used and in a nice consistent way. Although we consider the API "good", it may change completely. I'm committing it now so people will be able to start using it, and hopefully give feedback. Work by Aharon Hillel with my help. Author: tasn Date: 2011-07-07 07:41:03 -0700 (Thu, 07 Jul 2011) New Revision: 61118 Trac: http://trac.enlightenment.org/e/changeset/61118 Added: trunk/elementary/src/lib/elm_gesture_layer.c Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/Makefile.am Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-07-07 13:59:50 UTC (rev 61117) +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-07 14:41:03 UTC (rev 61118) @@ -3862,6 +3862,273 @@ * "drag,end" - Dragged item was dropped (somewhere) */ + /* gesture layer */ + /** @defgroup Elm_Gesture_Layer Gesture Layer */ + /** + * @enum _Elm_Gesture_Types + * Emum of supported gesture types. + * @ingroup Elm_Gesture_Layer + */ + enum _Elm_Gesture_Types + { + ELM_GESTURE_FIRST = 0, + + ELM_GESTURE_N_TAPS, /**< N fingers single taps */ + ELM_GESTURE_N_DOUBLE_TAPS, /**< N fingers double-single taps */ + ELM_GESTURE_N_TRIPLE_TAPS, /**< N fingers triple-single taps */ + + ELM_GESTURE_MOMENTUM, /**< Reports momentum in the dircetion of move */ + + ELM_GESTURE_N_LINES, /**< N fingers line gesture */ + ELM_GESTURE_N_FLICKS, /**< N fingers flick gesture */ + + ELM_GESTURE_ZOOM, /**< Zoom */ + ELM_GESTURE_ROTATE, /**< Rotate */ + + ELM_GESTURE_LAST + }; + + /** + * @typedef Elm_Gesture_Types + * Type for Emum of supported gesture types. + * @ingroup Elm_Gesture_Layer + */ + typedef enum _Elm_Gesture_Types Elm_Gesture_Types; + + /** + * @enum _Elm_Gesture_State + * Emum of gesture states. + * @ingroup Elm_Gesture_Layer + */ + enum _Elm_Gesture_State + { + ELM_GESTURE_STATE_UNDEFINED = -1, /**< Gesture not STARTed */ + ELM_GESTURE_STATE_START, /**< Gesture STARTed */ + ELM_GESTURE_STATE_MOVE, /**< Gesture is ongoing */ + ELM_GESTURE_STATE_END, /**< Gesture completed */ + ELM_GESTURE_STATE_ABORT /**< Onging gesture was ABORTed */ + }; + /** + * @typedef Elm_Gesture_State + * gesture states. + * @ingroup Elm_Gesture_Layer + */ + typedef enum _Elm_Gesture_State Elm_Gesture_State; + + /** + * @struct _Elm_Gesture_Taps_Info + * Struct holds taps info for user + * @ingroup Elm_Gesture_Layer + */ + struct _Elm_Gesture_Taps_Info + { + Evas_Coord x, y; /**< Holds center point between fingers */ + unsigned int n; /**< Number of fingers tapped */ + unsigned int timestamp; /**< event timestamp */ + }; + + /** + * @typedef Elm_Gesture_Taps_Info + * holds taps info for user + * @ingroup Elm_Gesture_Layer + */ + typedef struct _Elm_Gesture_Taps_Info Elm_Gesture_Taps_Info; + + /** + * @struct _Elm_Gesture_Momentum_Info + * Struct holds momentum info for user + * x1 and y1 are not necessarily in sync + * x1 holds x value of x direction starting point + * and same holds for y1. + * This is noticeable when doing V-shape movement + * @ingroup Elm_Gesture_Layer + */ + struct _Elm_Gesture_Momentum_Info + { /* Report line ends, timestamps, and momentum computed */ + Evas_Coord x1; /**< Final-swipe direction starting point on X */ + Evas_Coord y1; /**< Final-swipe direction starting point on Y */ + Evas_Coord x2; /**< Final-swipe direction ending point on X */ + Evas_Coord y2; /**< Final-swipe direction ending point on Y */ + + unsigned int tx; /**< Timestamp of start of final x-swipe */ + unsigned int ty; /**< Timestamp of start of final y-swipe */ + + Evas_Coord mx; /**< Momentum on X */ + Evas_Coord my; /**< Momentum on Y */ + }; + + /** + * @typedef Elm_Gesture_Momentum_Info + * holds momentum info for user + * @ingroup Elm_Gesture_Layer + */ + typedef struct _Elm_Gesture_Momentum_Info Elm_Gesture_Momentum_Info; + + /** + * @struct _Elm_Gesture_Line_Info + * Struct holds line info for user + * @ingroup Elm_Gesture_Layer + */ + struct _Elm_Gesture_Line_Info + { /* Report line ends, timestamps, and momentum computed */ + Elm_Gesture_Momentum_Info momentum; /**< Line momentum info */ + unsigned int n; /**< Number of fingers (lines) */ + /* FIXME should be radians, bot degrees */ + double angle; /**< Angle (direction) of lines */ + }; + + /** + * @typedef _Elm_Gesture_Line_Info + * Holds line info for user + * @ingroup Elm_Gesture_Layer + */ + typedef struct _Elm_Gesture_Line_Info Elm_Gesture_Line_Info; + + /** + * @struct _Elm_Gesture_Zoom_Info + * Struct holds zoom info for user + * @ingroup Elm_Gesture_Layer + */ + struct _Elm_Gesture_Zoom_Info + { + Evas_Coord x, y; /**< Holds zoom center point reported to user */ + Evas_Coord radius; /**< Holds radius between fingers reported to user */ + float zoom; /**< Zoom value: 1.0 means no zoom */ + float momentum; /**< Zoom momentum: zoom growth per second (NOT YET SUPPORTED) */ + }; + + /** + * @typedef Elm_Gesture_Zoom_Info + * Holds zoom info for user + * @ingroup Elm_Gesture_Layer + */ + typedef struct _Elm_Gesture_Zoom_Info Elm_Gesture_Zoom_Info; + + /** + * @struct _Elm_Gesture_Rotate_Info + * Struct holds rotation info for user + * @ingroup Elm_Gesture_Layer + */ + struct _Elm_Gesture_Rotate_Info + { + Evas_Coord x, y; /**< Holds zoom center point reported to user */ + Evas_Coord radius; /**< Holds radius between fingers reported to user */ + double base_angle; /**< Holds start-angle */ + double angle; /**< Rotation value: 0.0 means no rotation */ + double momentum; /**< Rotation momentum: rotation done per second (NOT YET SUPPORTED) */ + }; + + /** + * @typedef Elm_Gesture_Rotate_Info + * Holds rotation info for user + * @ingroup Elm_Gesture_Layer + */ + typedef struct _Elm_Gesture_Rotate_Info Elm_Gesture_Rotate_Info; + + /** + * @typedef Elm_Gesture_Event_Cb + * User callback used to stream gesture info from gesture layer + * @param data user data + * @param event_info gesture report info + * Returns a flag field to be applied on the causing event. + * You should probably return EVAS_EVENT_FLAG_ON_HOLD if your widget acted + * upon the event, in an irreversible way. + * + * @ingroup Elm_Gesture_Layer + */ + typedef Evas_Event_Flags (*Elm_Gesture_Event_Cb) (void *data, void *event_info); + + /** + * Use function to set callbacks to be notified about + * change of state of gesture. + * When a user registers a callback with this function + * this means this gesture has to be tested. + * + * When ALL callbacks for a gesture are set to NULL + * it means user isn't interested in gesture-state + * and it will not be tested. + * + * @param obj Pointer to gesture-layer. + * @param idx The gesture you would like to track its state. + * @param cb callback function pointer. + * @param cb_type what event this callback tracks: START, MOVE, END, ABORT. + * @param data user info to be sent to callback (usually, Smart Data) + * + * @ingroup Elm_Gesture_Layer + */ + EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data) EINA_ARG_NONNULL(1); + + /** + * Call this function to get repeat-events settings. + * + * @param obj Pointer to gesture-layer. + * + * @return repeat events settings. + * @see elm_gesture_layer_hold_events_set() + * @ingroup Elm_Gesture_Layer + */ + EAPI Eina_Bool elm_gesture_layer_hold_events_get(Evas_Object *obj) EINA_ARG_NONNULL(1); + + /** + * This function called in order to make gesture-layer repeat events. + * Set this of you like to get the raw events only if gestures were not detected. + * Clear this if you like gesture layer to fwd events as testing gestures. + * + * @param obj Pointer to gesture-layer. + * @param r Repeat: TRUE/FALSE + * + * @ingroup Elm_Gesture_Layer + */ + EAPI void elm_gesture_layer_hold_events_set(Evas_Object *obj, Eina_Bool r) EINA_ARG_NONNULL(1); + + /** + * This function sets step-value for zoom action. + * Set step to any positive value. + * Cancel step setting by setting to 0.0 + * + * @param obj Pointer to gesture-layer. + * @param s new zoom step value. + * + * @ingroup Elm_Gesture_Layer + */ + EAPI void elm_gesture_layer_zoom_step_set(Evas_Object *obj, double s) EINA_ARG_NONNULL(1); + + /** + * This function sets step-value for rotate action. + * Set step to any positive value. + * Cancel step setting by setting to 0.0 + * + * @param obj Pointer to gesture-layer. + * @param s new roatate step value. + * + * @ingroup Elm_Gesture_Layer + */ + EAPI void elm_gesture_layer_rotate_step_set(Evas_Object *obj, double s) EINA_ARG_NONNULL(1); + + /** + * This function called to attach gesture-layer to an Evas_Object. + * @param obj Pointer to gesture-layer. + * @param t Pointer to underlying object (AKA Target) + * + * @return TRUE, FALSE on success, failure. + * + * @ingroup Elm_Gesture_Layer + */ + EAPI Eina_Bool elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *t) EINA_ARG_NONNULL(1, 2); + + /** + * Call this function to construct a new gesture-layer object. + * This does not activate the gesture layer. You have to + * call elm_gesture_layer_attach in order to 'activate' gesture-layer. + * + * @param parent the parent object. + * + * @return Pointer to new gesture-layer object. + * + * @ingroup Elm_Gesture_Layer + */ + EAPI Evas_Object *elm_gesture_layer_add(Evas_Object *parent) EINA_ARG_NONNULL(1); + /* thumb */ typedef enum _Elm_Thumb_Animation_Setting { Modified: trunk/elementary/src/lib/Makefile.am =================================================================== --- trunk/elementary/src/lib/Makefile.am 2011-07-07 13:59:50 UTC (rev 61117) +++ trunk/elementary/src/lib/Makefile.am 2011-07-07 14:41:03 UTC (rev 61118) @@ -72,6 +72,7 @@ elm_gengrid.c \ elm_genlist.c \ elm_genscroller.c \ +elm_gesture_layer.c \ elm_glview.c \ elm_grid.c \ elm_hover.c \ |