From: Enlightenment S. <no-...@en...> - 2011-04-01 11:51:18
|
Log: elementary - fileselecto, actionslider, anchorview, fileselector_button, anchorblock, fileselector_entry, hoversel, scrolled_entry Author: hermet Date: 2011-04-01 04:51:11 -0700 (Fri, 01 Apr 2011) New Revision: 58254 Trac: http://trac.enlightenment.org/e/changeset/58254 Modified: trunk/elementary/src/lib/elc_anchorblock.c trunk/elementary/src/lib/elc_anchorview.c trunk/elementary/src/lib/elc_fileselector.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/elc_scrolled_entry.c trunk/elementary/src/lib/elm_actionslider.c Modified: trunk/elementary/src/lib/elc_anchorblock.c =================================================================== --- trunk/elementary/src/lib/elc_anchorblock.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elc_anchorblock.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -37,10 +37,10 @@ static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_ANCHOR_CLICKED, ""}, /* TODO: declare the type properly, as data is - * being passed - */ - {NULL, NULL} + {SIG_ANCHOR_CLICKED, ""}, /* TODO: declare the type properly, as data is + * being passed + */ + {NULL, NULL} }; static void _del_pre_hook(Evas_Object *obj); @@ -273,16 +273,16 @@ } /** - * Get the markup text set for the anchorblock - * - * This retrieves back the string set by @c elm_anchorblock_text_set(). - * - * @param obj The anchorblock object - * @return text The markup text set or @c NULL, either if it was not set - * or an error occurred - * - * @ingroup Anchorblock - */ + * Get the markup text set for the anchorblock + * + * This retrieves back the string set by @c elm_anchorblock_text_set(). + * + * @param obj The anchorblock object + * @return text The markup text set or @c NULL, either if it was not set + * or an error occurred + * + * @ingroup Anchorblock + */ EAPI const char* elm_anchorblock_text_get(const Evas_Object *obj) { @@ -406,7 +406,7 @@ * and object to do this), then this object is used to replace that item. If * not the next provider is called until one provides an item object, or the * default provider in anchorblock does. - * + * * @param obj The anchorblock object * @param func The function called to provide the item object * @param data The data passed to @p func @@ -432,7 +432,7 @@ * * This prepends the given callback. See elm_anchorblock_item_provider_append() for * more information - * + * * @param obj The anchorblock object * @param func The function called to provide the item object * @param data The data passed to @p func @@ -458,7 +458,7 @@ * * This removes the given callback. See elm_anchorblock_item_provider_append() for * more information - * + * * @param obj The anchorblock object * @param func The function called to provide the item object * @param data The data passed to @p func Modified: trunk/elementary/src/lib/elc_anchorview.c =================================================================== --- trunk/elementary/src/lib/elc_anchorview.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elc_anchorview.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -34,10 +34,10 @@ static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_ANCHOR_CLICKED, ""}, /* TODO: declare the type properly, as data is - * being passed - */ - {NULL, NULL} + {SIG_ANCHOR_CLICKED, ""}, /* TODO: declare the type properly, as data is + * being passed + */ + {NULL, NULL} }; static void _del_pre_hook(Evas_Object *obj); @@ -175,7 +175,7 @@ Widget_Data *wd = elm_widget_data_get(data); Eina_List *l; Elm_Anchorview_Item_Provider *ip; - + EINA_LIST_FOREACH(wd->item_providers, l, ip) { Evas_Object *o; @@ -202,7 +202,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "anchorview"); elm_widget_type_set(obj, "anchorview"); elm_widget_sub_object_add(parent, obj); @@ -223,12 +223,12 @@ evas_object_show(wd->entry); evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + _changed_size_hints, obj); elm_entry_entry_set(wd->entry, ""); evas_object_smart_callback_add(wd->entry, "anchor,clicked", - _anchor_clicked, obj); + _anchor_clicked, obj); _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); @@ -240,18 +240,18 @@ } /** - * Set the text markup of the anchorview - * - * This sets the text of the anchorview to be the text given as @p text. This - * text is in markup format with \<a href=XXX\> beginning an achor with the - * string link of 'XXX', and \</\> or \</a\> ending the link. Other markup can - * be used dependign on the style support. - * - * @param obj The anchorview object - * @param text The text to set, or NULL to clear - * - * @ingroup Anchorview - */ + * Set the text markup of the anchorview + * + * This sets the text of the anchorview to be the text given as @p text. This + * text is in markup format with \<a href=XXX\> beginning an achor with the + * string link of 'XXX', and \</\> or \</a\> ending the link. Other markup can + * be used dependign on the style support. + * + * @param obj The anchorview object + * @param text The text to set, or NULL to clear + * + * @ingroup Anchorview + */ EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text) { @@ -267,16 +267,16 @@ } /** - * Get the markup text set for the anchorview - * - * This retrieves back the string set by @c elm_anchorview_text_set(). - * - * @param obj The anchorview object - * @return text The markup text set or @c NULL, either if it was not set - * or an error occurred - * - * @ingroup Anchorview - */ + * Get the markup text set for the anchorview + * + * This retrieves back the string set by @c elm_anchorview_text_set(). + * + * @param obj The anchorview object + * @return text The markup text set or @c NULL, either if it was not set + * or an error occurred + * + * @ingroup Anchorview + */ EAPI const char* elm_anchorview_text_get(const Evas_Object *obj) { @@ -287,16 +287,16 @@ } /** - * Set the parent of the hover popup - * - * This sets the parent of the hover that anchorview will create. See hover - * objects for more information on this. - * - * @param obj The anchorview object - * @param parent The parent the hover should use - * - * @ingroup Anchorview - */ + * Set the parent of the hover popup + * + * This sets the parent of the hover that anchorview will create. See hover + * objects for more information on this. + * + * @param obj The anchorview object + * @param parent The parent the hover should use + * + * @ingroup Anchorview + */ EAPI void elm_anchorview_hover_parent_set(Evas_Object *obj, Evas_Object *parent) { @@ -311,16 +311,16 @@ } /** - * Get the parent of the hover popup - * - * This gets the parent of the hover that anchorview will created. See hover - * objects for more information on this. - * - * @param obj The anchorview object - * @return The parent used by hover - * - * @ingroup Anchorview - */ + * Get the parent of the hover popup + * + * This gets the parent of the hover that anchorview will created. See hover + * objects for more information on this. + * + * @param obj The anchorview object + * @return The parent used by hover + * + * @ingroup Anchorview + */ EAPI Evas_Object * elm_anchorview_hover_parent_get(const Evas_Object *obj) { @@ -331,16 +331,16 @@ } /** - * Set the style that the hover should use - * - * This sets the style for the hover that anchorview will create. See hover - * objects for more information - * - * @param obj The anchorview object - * @param style The style to use - * - * @ingroup Anchorview - */ + * Set the style that the hover should use + * + * This sets the style for the hover that anchorview will create. See hover + * objects for more information + * + * @param obj The anchorview object + * @param style The style to use + * + * @ingroup Anchorview + */ EAPI void elm_anchorview_hover_style_set(Evas_Object *obj, const char *style) { @@ -371,14 +371,14 @@ } /** - * Stop the hover popup in the anchorview - * - * This will stop the hover popup in the anchorview if it is currently active. - * - * @param obj The anchorview object - * - * @ingroup Anchorview - */ + * Stop the hover popup in the anchorview + * + * This will stop the hover popup in the anchorview if it is currently active. + * + * @param obj The anchorview object + * + * @ingroup Anchorview + */ EAPI void elm_anchorview_hover_end(Evas_Object *obj) { @@ -439,7 +439,7 @@ * and object to do this), then this object is used to replace that item. If * not the next provider is called until one provides an item object, or the * default provider in anchorview does. - * + * * @param obj The anchorview object * @param func The function called to provide the item object * @param data The data passed to @p func @@ -465,7 +465,7 @@ * * This prepends the given callback. See elm_anchorview_item_provider_append() for * more information - * + * * @param obj The anchorview object * @param func The function called to provide the item object * @param data The data passed to @p func @@ -491,7 +491,7 @@ * * This removes the given callback. See elm_anchorview_item_provider_append() for * more information - * + * * @param obj The anchorview object * @param func The function called to provide the item object * @param data The data passed to @p func Modified: trunk/elementary/src/lib/elc_fileselector.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elc_fileselector.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -570,7 +570,7 @@ int s; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "fileselector"); elm_widget_type_set(obj, "fileselector"); elm_widget_sub_object_add(parent, obj); @@ -580,7 +580,7 @@ elm_widget_can_focus_set(obj, EINA_FALSE); wd->expand = !!_elm_config->fileselector_expand_enable; - + wd->edje = edje_object_add(e); _elm_theme_object_set(obj, wd->edje, "fileselector", "base", "default"); elm_widget_resize_object_set(obj, wd->edje); Modified: trunk/elementary/src/lib/elc_fileselector_button.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_button.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elc_fileselector_button.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -18,12 +18,12 @@ const char *window_title; Evas_Coord w, h; struct - { - const char *path; - Eina_Bool expandable : 1; - Eina_Bool folder_only : 1; - Eina_Bool is_save : 1; - } fsd; + { + const char *path; + Eina_Bool expandable : 1; + Eina_Bool folder_only : 1; + Eina_Bool is_save : 1; + } fsd; Eina_Bool inwin_mode : 1; }; @@ -48,8 +48,8 @@ static const char SIG_FILE_CHOSEN[] = "file,chosen"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_FILE_CHOSEN, "s"}, - {NULL, NULL} + {SIG_FILE_CHOSEN, "s"}, + {NULL, NULL} }; static void @@ -264,7 +264,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "fileselector_button"); elm_widget_type_set(obj, "fileselector_button"); elm_widget_sub_object_add(parent, obj); @@ -284,7 +284,7 @@ wd->inwin_mode = _elm_config->inwin_dialogs_enable; wd->w = 400; wd->h = 400; - + wd->btn = elm_button_add(parent); elm_widget_mirrored_automatic_set(wd->btn, EINA_FALSE); elm_widget_resize_object_set(obj, wd->btn); Modified: trunk/elementary/src/lib/elc_fileselector_entry.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_entry.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elc_fileselector_entry.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -228,7 +228,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "fileselector_entry"); elm_widget_type_set(obj, "fileselector_entry"); elm_widget_sub_object_add(parent, obj); @@ -250,7 +250,7 @@ edje_object_part_swallow(wd->edje, "elm.swallow.button", wd->button); elm_widget_sub_object_add(obj, wd->button); evas_object_event_callback_add - (wd->button, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + (wd->button, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); elm_fileselector_button_expandable_set(wd->button, _elm_config->fileselector_expand_enable); @@ -269,7 +269,7 @@ edje_object_part_swallow(wd->edje, "elm.swallow.entry", wd->entry); elm_widget_sub_object_add(obj, wd->entry); evas_object_event_callback_add - (wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + (wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); #define SIG_FWD(name) \ evas_object_smart_callback_add(wd->entry, SIG_##name, _##name##_fwd, obj) Modified: trunk/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/elementary/src/lib/elc_hoversel.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elc_hoversel.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -61,9 +61,9 @@ EINA_LIST_FREE(wd->items, item) { elm_widget_item_pre_notify_del(item); - eina_stringshare_del(item->label); - eina_stringshare_del(item->icon_file); - eina_stringshare_del(item->icon_group); + eina_stringshare_del(item->label); + eina_stringshare_del(item->icon_file); + eina_stringshare_del(item->icon_group); elm_widget_item_del(item); } } @@ -95,9 +95,9 @@ elm_hoversel_hover_end(obj); if (wd->horizontal) - snprintf(buf, sizeof(buf), "hoversel_horizontal/%s", elm_widget_style_get(obj)); + snprintf(buf, sizeof(buf), "hoversel_horizontal/%s", elm_widget_style_get(obj)); else - snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj)); + snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj)); elm_object_style_set(wd->btn, buf); elm_object_disabled_set(wd->btn, elm_widget_disabled_get(obj)); _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -187,9 +187,9 @@ bx = elm_box_add(wd->hover); elm_widget_mirrored_automatic_set(bx, EINA_FALSE); elm_box_homogenous_set(bx, 1); - + elm_box_horizontal_set(bx, wd->horizontal); - + if (wd->horizontal) snprintf(buf, sizeof(buf), "hoversel_horizontal_entry/%s", elm_widget_style_get(obj)); @@ -198,27 +198,27 @@ elm_widget_style_get(obj)); EINA_LIST_FOREACH(wd->items, l, item) { - bt = elm_button_add(wd->hover); + bt = elm_button_add(wd->hover); 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); - if (item->icon_file) - { - ic = elm_icon_add(obj); - elm_icon_scale_set(ic, 0, 1); - if (item->icon_type == ELM_ICON_FILE) - elm_icon_file_set(ic, item->icon_file, item->icon_group); - else if (item->icon_type == ELM_ICON_STANDARD) - elm_icon_standard_set(ic, item->icon_file); - elm_button_icon_set(bt, ic); - evas_object_show(ic); - } - evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_box_pack_end(bx, bt); - evas_object_smart_callback_add(bt, "clicked", _item_clicked, item); - evas_object_show(bt); + elm_object_style_set(bt, buf); + elm_button_label_set(bt, item->label); + if (item->icon_file) + { + ic = elm_icon_add(obj); + elm_icon_scale_set(ic, 0, 1); + if (item->icon_type == ELM_ICON_FILE) + elm_icon_file_set(ic, item->icon_file, item->icon_group); + else if (item->icon_type == ELM_ICON_STANDARD) + elm_icon_standard_set(ic, item->icon_file); + elm_button_icon_set(bt, ic); + evas_object_show(ic); + } + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_box_pack_end(bx, bt); + evas_object_smart_callback_add(bt, "clicked", _item_clicked, item); + evas_object_show(bt); } if (wd->horizontal) @@ -236,7 +236,7 @@ evas_object_show(wd->hover); evas_object_smart_callback_call(obj, "clicked", NULL); -// if (wd->horizontal) evas_object_hide(wd->btn); + // if (wd->horizontal) evas_object_hide(wd->btn); } static void @@ -275,7 +275,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "hoversel"); elm_widget_type_set(obj, "hoversel"); elm_widget_sub_object_add(parent, obj); @@ -293,7 +293,7 @@ wd->expanded = EINA_FALSE; elm_widget_resize_object_set(obj, wd->btn); evas_object_event_callback_add(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + _changed_size_hints, obj); evas_object_smart_callback_add(wd->btn, "clicked", _button_clicked, obj); elm_widget_sub_object_add(obj, wd->btn); @@ -321,7 +321,7 @@ if (!wd) return; if (wd->hover_parent) evas_object_event_callback_del_full(wd->hover_parent, EVAS_CALLBACK_DEL, - _parent_del, obj); + _parent_del, obj); wd->hover_parent = parent; if (wd->hover_parent) evas_object_event_callback_add(wd->hover_parent, EVAS_CALLBACK_DEL, @@ -539,7 +539,7 @@ if (!wd) return EINA_FALSE; return (wd->hover) ? EINA_TRUE : EINA_FALSE; } - + /** * This will remove all the children items from the hoversel. (should not be * called while the hoversel is active; use elm_hoversel_expanded_get() Modified: trunk/elementary/src/lib/elc_scrolled_entry.c =================================================================== --- trunk/elementary/src/lib/elc_scrolled_entry.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elc_scrolled_entry.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -86,23 +86,23 @@ static const char SIG_CURSOR_CHANGED[] = "cursor,changed"; static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CHANGED, ""}, - {SIG_ACTIVATED, ""}, - {SIG_PRESS, ""}, - {SIG_LONGPRESSED, ""}, - {SIG_CLICKED, ""}, - {SIG_CLICKED_DOUBLE, ""}, - {SIG_FOCUSED, ""}, - {SIG_UNFOCUSED, ""}, - {SIG_SELECTION_PASTE, ""}, - {SIG_SELECTION_COPY, ""}, - {SIG_SELECTION_CUT, ""}, - {SIG_SELECTION_START, ""}, - {SIG_SELECTION_CHANGED, ""}, - {SIG_SELECTION_CLEARED, ""}, - {SIG_CURSOR_CHANGED, ""}, - {SIG_ANCHOR_CLICKED, ""}, - {NULL, NULL} + {SIG_CHANGED, ""}, + {SIG_ACTIVATED, ""}, + {SIG_PRESS, ""}, + {SIG_LONGPRESSED, ""}, + {SIG_CLICKED, ""}, + {SIG_CLICKED_DOUBLE, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, + {SIG_SELECTION_PASTE, ""}, + {SIG_SELECTION_COPY, ""}, + {SIG_SELECTION_CUT, ""}, + {SIG_SELECTION_START, ""}, + {SIG_SELECTION_CHANGED, ""}, + {SIG_SELECTION_CLEARED, ""}, + {SIG_CURSOR_CHANGED, ""}, + {SIG_ANCHOR_CLICKED, ""}, + {NULL, NULL} }; static void @@ -190,7 +190,7 @@ if (!wd) return; elm_object_signal_callback_add(wd->entry, emission, source, func_cb, data); elm_object_signal_callback_add(wd->scroller, emission, source, func_cb, - data); + data); } static void @@ -364,7 +364,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "scrolled_entry"); elm_widget_type_set(obj, "scrolled_entry"); elm_widget_sub_object_add(parent, obj); @@ -496,13 +496,13 @@ if (!wd) return NULL; if (wd->icon) { - Evas_Object *edje = _elm_scroller_edje_object_get(wd->scroller); - if (!edje) return NULL; - ret = wd->icon; - edje_object_part_unswallow(edje, wd->icon); - edje_object_signal_emit(edje, "elm,action,hide,icon", "elm"); - wd->icon = NULL; - _sizing_eval(obj); + Evas_Object *edje = _elm_scroller_edje_object_get(wd->scroller); + if (!edje) return NULL; + ret = wd->icon; + edje_object_part_unswallow(edje, wd->icon); + edje_object_signal_emit(edje, "elm,action,hide,icon", "elm"); + wd->icon = NULL; + _sizing_eval(obj); } return ret; } @@ -601,13 +601,13 @@ if (!wd) return NULL; if (wd->end) { - Evas_Object *edje = _elm_scroller_edje_object_get(wd->scroller); - if (!edje) return NULL; - ret = wd->end; - edje_object_part_unswallow(edje, wd->end); - edje_object_signal_emit(edje, "elm,action,hide,end", "elm"); - wd->end = NULL; - _sizing_eval(obj); + Evas_Object *edje = _elm_scroller_edje_object_get(wd->scroller); + if (!edje) return NULL; + ret = wd->end; + edje_object_part_unswallow(edje, wd->end); + edje_object_signal_emit(edje, "elm,action,hide,end", "elm"); + wd->end = NULL; + _sizing_eval(obj); } return ret; } @@ -656,13 +656,13 @@ wd->single_line = single_line; if (single_line) { - elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); - elm_scroller_content_min_limit(wd->scroller, 0, 1); + elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_scroller_content_min_limit(wd->scroller, 0, 1); } else { - elm_scroller_policy_set(wd->scroller, wd->policy_h, wd->policy_v); - elm_scroller_content_min_limit(wd->scroller, 0, 0); + elm_scroller_policy_set(wd->scroller, wd->policy_h, wd->policy_v); + elm_scroller_content_min_limit(wd->scroller, 0, 0); } _sizing_eval(obj); } Modified: trunk/elementary/src/lib/elm_actionslider.c =================================================================== --- trunk/elementary/src/lib/elm_actionslider.c 2011-04-01 11:35:07 UTC (rev 58253) +++ trunk/elementary/src/lib/elm_actionslider.c 2011-04-01 11:51:11 UTC (rev 58254) @@ -48,7 +48,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (wd->drag_button_base) + if (wd->drag_button_base) { evas_object_del(wd->drag_button_base); wd->drag_button_base = NULL; @@ -88,7 +88,7 @@ if (!wd) return; if (edje_object_mirrored_get(wd->as) == rtl) - return; + return; edje_object_mirrored_set(wd->as, rtl); if (!elm_widget_mirrored_get(obj)) @@ -131,7 +131,7 @@ if (!wd) return; _elm_widget_mirrored_reload(obj); if (!edje_object_part_swallow_get(wd->as, "elm.drag_button_base")) - edje_object_part_unswallow(wd->as, wd->drag_button_base); + edje_object_part_unswallow(wd->as, wd->drag_button_base); _elm_theme_object_set(obj, wd->as, "actionslider", "base", elm_widget_style_get(obj)); @@ -165,15 +165,15 @@ if (!wd->mouse_down) return; edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &pos, NULL); if (pos == 0.0) - evas_object_smart_callback_call(obj, SIG_CHANGED, - (void *) ((!elm_widget_mirrored_get(obj)) ? - "left" : "right")); + evas_object_smart_callback_call(obj, SIG_CHANGED, + (void *) ((!elm_widget_mirrored_get(obj)) ? + "left" : "right")); else if (pos == 1.0) - evas_object_smart_callback_call(obj, SIG_CHANGED, - (void *) ((!elm_widget_mirrored_get(obj)) ? - "right" : "left")); + evas_object_smart_callback_call(obj, SIG_CHANGED, + (void *) ((!elm_widget_mirrored_get(obj)) ? + "right" : "left")); else if (pos >= 0.45 && pos <= 0.55) - evas_object_smart_callback_call(obj, SIG_CHANGED, (void *)"center"); + evas_object_smart_callback_call(obj, SIG_CHANGED, (void *)"center"); } static Eina_Bool @@ -220,16 +220,16 @@ { if ((!wd->final_position) && (wd->enabled_position & ELM_ACTIONSLIDER_LEFT)) - evas_object_smart_callback_call(data, SIG_SELECTED, - (void *)wd->text_left); + evas_object_smart_callback_call(data, SIG_SELECTED, + (void *)wd->text_left); else if ((wd->final_position == 0.5) && (wd->enabled_position & ELM_ACTIONSLIDER_CENTER)) - evas_object_smart_callback_call(data, SIG_SELECTED, - (void *)wd->text_center); + evas_object_smart_callback_call(data, SIG_SELECTED, + (void *)wd->text_center); else if ((wd->final_position == 1) && (wd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) - evas_object_smart_callback_call(data, SIG_SELECTED, - (void *)wd->text_right); + evas_object_smart_callback_call(data, SIG_SELECTED, + (void *)wd->text_right); return EINA_FALSE; } return EINA_TRUE; @@ -287,39 +287,39 @@ if (position < 0.3) { if (wd->magnet_position & ELM_ACTIONSLIDER_LEFT) - wd->final_position = _FINAL_POS_BY_ORIENTATION(0); + wd->final_position = _FINAL_POS_BY_ORIENTATION(0); else if (wd->magnet_position & ELM_ACTIONSLIDER_CENTER) - wd->final_position = 0.5; + wd->final_position = 0.5; else if (wd->magnet_position & ELM_ACTIONSLIDER_RIGHT) - wd->final_position = _FINAL_POS_BY_ORIENTATION(1); + wd->final_position = _FINAL_POS_BY_ORIENTATION(1); } else if ((position >= 0.3) && (position <= 0.7)) { if (wd->magnet_position & ELM_ACTIONSLIDER_CENTER) - wd->final_position = 0.5; + wd->final_position = 0.5; else if (position < 0.5) { if (wd->magnet_position & ELM_ACTIONSLIDER_LEFT) - wd->final_position = _FINAL_POS_BY_ORIENTATION(0); + wd->final_position = _FINAL_POS_BY_ORIENTATION(0); else - wd->final_position = _FINAL_POS_BY_ORIENTATION(1); + wd->final_position = _FINAL_POS_BY_ORIENTATION(1); } else { if (wd->magnet_position & ELM_ACTIONSLIDER_RIGHT) - wd->final_position = _FINAL_POS_BY_ORIENTATION(1); + wd->final_position = _FINAL_POS_BY_ORIENTATION(1); else - wd->final_position = _FINAL_POS_BY_ORIENTATION(0); + wd->final_position = _FINAL_POS_BY_ORIENTATION(0); } } else { if (wd->magnet_position & ELM_ACTIONSLIDER_RIGHT) - wd->final_position = _FINAL_POS_BY_ORIENTATION(1); + wd->final_position = _FINAL_POS_BY_ORIENTATION(1); else if (wd->magnet_position & ELM_ACTIONSLIDER_CENTER) - wd->final_position = 0.5; + wd->final_position = 0.5; else - wd->final_position = _FINAL_POS_BY_ORIENTATION(0); + wd->final_position = _FINAL_POS_BY_ORIENTATION(0); } wd->button_animator = ecore_animator_add(_button_animation, data); @@ -342,7 +342,7 @@ Evas *e; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "actionslider"); elm_widget_type_set(obj, "actionslider"); elm_widget_sub_object_add(parent, obj); @@ -416,11 +416,11 @@ edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &position, NULL); if (position < 0.3) - return _get_pos_by_orientation(obj, ELM_ACTIONSLIDER_LEFT); + return _get_pos_by_orientation(obj, ELM_ACTIONSLIDER_LEFT); else if (position < 0.7) - return ELM_ACTIONSLIDER_CENTER; + return ELM_ACTIONSLIDER_CENTER; else - return _get_pos_by_orientation(obj, ELM_ACTIONSLIDER_RIGHT); + return _get_pos_by_orientation(obj, ELM_ACTIONSLIDER_RIGHT); } /** @@ -573,15 +573,15 @@ if ((wd->final_position == 0.0) && (wd->enabled_position & ELM_ACTIONSLIDER_LEFT)) - return wd->text_left; + return wd->text_left; if ((wd->final_position == 0.5) && (wd->enabled_position & ELM_ACTIONSLIDER_CENTER)) - return wd->text_center; + return wd->text_center; if ((wd->final_position == 1.0) && (wd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) - return wd->text_right; + return wd->text_right; return NULL; } @@ -594,7 +594,7 @@ * * @ingroup Actionslider */ -EAPI void +EAPI void elm_actionslider_indicator_label_set(Evas_Object *obj, const char *label) { ELM_CHECK_WIDTYPE(obj, widtype); |
From: Enlightenment S. <no-...@en...> - 2011-04-01 19:09:04
|
Log: elementary / entry, list, scroller, fileselector_button, config, photocam, map, pan, bg, store, priv, pager, conform, box, clock, flipselector fixed indentation, removed white spaces. Author: hermet Date: 2011-04-01 12:08:56 -0700 (Fri, 01 Apr 2011) New Revision: 58267 Trac: http://trac.enlightenment.org/e/changeset/58267 Modified: trunk/elementary/src/lib/elc_fileselector_button.c trunk/elementary/src/lib/elm_bg.c trunk/elementary/src/lib/elm_box.c trunk/elementary/src/lib/elm_clock.c trunk/elementary/src/lib/elm_config.c trunk/elementary/src/lib/elm_conform.c trunk/elementary/src/lib/elm_entry.c trunk/elementary/src/lib/elm_flipselector.c trunk/elementary/src/lib/elm_list.c trunk/elementary/src/lib/elm_map.c trunk/elementary/src/lib/elm_pager.c trunk/elementary/src/lib/elm_photocam.c trunk/elementary/src/lib/elm_priv.h trunk/elementary/src/lib/elm_store.c trunk/elementary/src/lib/els_pan.c trunk/elementary/src/lib/els_scroller.c Modified: trunk/elementary/src/lib/elc_fileselector_button.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_button.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elc_fileselector_button.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -18,12 +18,12 @@ const char *window_title; Evas_Coord w, h; struct - { - const char *path; - Eina_Bool expandable : 1; - Eina_Bool folder_only : 1; - Eina_Bool is_save : 1; - } fsd; + { + const char *path; + Eina_Bool expandable : 1; + Eina_Bool folder_only : 1; + Eina_Bool is_save : 1; + } fsd; Eina_Bool inwin_mode : 1; }; Modified: trunk/elementary/src/lib/elm_bg.c =================================================================== --- trunk/elementary/src/lib/elm_bg.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_bg.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -39,7 +39,7 @@ Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord w, h; - _elm_theme_object_set(obj, wd->base, "bg", "base", + _elm_theme_object_set(obj, wd->base, "bg", "base", elm_widget_style_get(obj)); if (wd->rect) @@ -80,7 +80,7 @@ nw = bw; nh = bh; - switch (wd->option) + switch (wd->option) { case ELM_BG_OPTION_CENTER: fw = nw = iw; @@ -149,7 +149,7 @@ _elm_theme_object_set(obj, wd->base, "bg", "base", "default"); elm_widget_resize_object_set(obj, wd->base); - evas_object_event_callback_add(wd->base, EVAS_CALLBACK_RESIZE, + evas_object_event_callback_add(wd->base, EVAS_CALLBACK_RESIZE, _custom_resize, wd); wd->option = ELM_BG_OPTION_SCALE; @@ -241,8 +241,8 @@ * * @ingroup Bg */ -EAPI void -elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option) +EAPI void +elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd; @@ -282,8 +282,8 @@ * * @ingroup Bg */ -EAPI void -elm_bg_color_set(Evas_Object *obj, int r, int g, int b) +EAPI void +elm_bg_color_set(Evas_Object *obj, int r, int g, int b) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd; Modified: trunk/elementary/src/lib/elm_box.c =================================================================== --- trunk/elementary/src/lib/elm_box.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_box.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -225,7 +225,7 @@ Evas_Coord x, y, w, h; const double curtime = ecore_loop_time_get(); - layout_data->duration = + layout_data->duration = layout_data->duration - (curtime - layout_data->initial_time); layout_data->initial_time = curtime; @@ -286,11 +286,11 @@ return EINA_FALSE; _transition_layout_calculate_coords(obj, priv, layout_data); - evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, + evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _transition_layout_obj_resize_cb, layout_data); - evas_object_smart_callback_add(obj, SIG_CHILD_ADDED, + evas_object_smart_callback_add(obj, SIG_CHILD_ADDED, _transition_layout_child_added, layout_data); - evas_object_smart_callback_add(obj, SIG_CHILD_REMOVED, + evas_object_smart_callback_add(obj, SIG_CHILD_REMOVED, _transition_layout_child_removed, layout_data); if (!layout_data->animator) layout_data->animator = ecore_animator_add(transition_animation_cb, obj); @@ -398,24 +398,24 @@ if (!wd) return; wd->horizontal = !!horizontal; evas_object_smart_calculate(wd->box); - /*if (wd->horizontal) + /*if (wd->horizontal) { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_horizontal, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_horizontal, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); } - else + else { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_vertical, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); - }*/ + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_vertical, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); + } */ } /** @@ -454,24 +454,24 @@ if (!wd) return; wd->homogeneous = !!homogenous; evas_object_smart_calculate(wd->box); - /*if (wd->horizontal) + /*if (wd->horizontal) { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_horizontal, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_horizontal, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); } - else + else { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_vertical, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); - }*/ + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_vertical, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); + } */ } /** Modified: trunk/elementary/src/lib/elm_clock.c =================================================================== --- trunk/elementary/src/lib/elm_clock.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_clock.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -25,14 +25,14 @@ Evas_Object *sel_obj; Ecore_Timer *ticker, *spin; struct - { - int hrs, min, sec; - char ampm; - Eina_Bool seconds : 1; - Eina_Bool am_pm : 1; - Eina_Bool edit : 1; - Elm_Clock_Digedit digedit; - } cur; + { + int hrs, min, sec; + char ampm; + Eina_Bool seconds : 1; + Eina_Bool am_pm : 1; + Eina_Bool edit : 1; + Elm_Clock_Digedit digedit; + } cur; }; static const char *widtype = NULL; Modified: trunk/elementary/src/lib/elm_config.c =================================================================== --- trunk/elementary/src/lib/elm_config.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_config.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -1573,10 +1573,10 @@ if (s) _elm_config->longpress_timeout = atof(s); if (_elm_config->longpress_timeout < 0.0) _elm_config->longpress_timeout = 0.0; - + s = getenv("ELM_EFFECT_ENABLE"); if (s) _elm_config->effect_enable = !!atoi(s); - + s = getenv("ELM_DESKTOP_ENTRY"); if (s) _elm_config->desktop_entry = !!atoi(s); } Modified: trunk/elementary/src/lib/elm_conform.c =================================================================== --- trunk/elementary/src/lib/elm_conform.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_conform.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -102,32 +102,32 @@ * visible when the vkbd comes and goes by moving the conformant obj (and thus * its children) to show the focused widget (and if focus changes follow) - static Evas_Object * - _focus_object_get(const Evas_Object *obj) - { - Evas_Object *win, *foc; +static Evas_Object * +_focus_object_get(const Evas_Object *obj) +{ + Evas_Object *win, *foc; - win = elm_widget_top_get(obj); - if (!win) return NULL; - foc = elm_widget_top_get(win); - } + win = elm_widget_top_get(obj); + if (!win) return NULL; + foc = elm_widget_top_get(win); +} - static void - _focus_object_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) - { - evas_object_geometry_get(obj, x, y, w, h); - } +static void +_focus_object_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +{ + evas_object_geometry_get(obj, x, y, w, h); +} - static void - _focus_change_del(void *data, Evas_Object *obj, void *event_info) - { -// called from toplevel when the focused window shanges +static void +_focus_change_del(void *data, Evas_Object *obj, void *event_info) +{ + // called from toplevel when the focused window shanges } static void _autoscroll_move(Evas_Object *obj) { -// move conformant edje by delta to show focused widget + // move conformant edje by delta to show focused widget } static void Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_entry.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -683,7 +683,7 @@ Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord cx, cy, cw, ch, x, y, mw, mh; if (!wd) return; - + cx = cy = 0; cw = ch = 1; evas_object_geometry_get(wd->ent, &x, &y, NULL, NULL); @@ -1434,17 +1434,17 @@ static Eina_Bool _event_selection_clear(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - /* - Widget_Data *wd = elm_widget_data_get(data); - Ecore_X_Event_Selection_Clear *ev = event; - if (!wd) return ECORE_CALLBACK_PASS_ON; - if (!wd->have_selection) return ECORE_CALLBACK_PASS_ON; - if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) || - (ev->selection == ECORE_X_SELECTION_PRIMARY)) - { - elm_entry_select_none(data); - } - return 1;*/ +/* + Widget_Data *wd = elm_widget_data_get(data); + Ecore_X_Event_Selection_Clear *ev = event; + if (!wd) return ECORE_CALLBACK_PASS_ON; + if (!wd->have_selection) return ECORE_CALLBACK_PASS_ON; + if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) || + (ev->selection == ECORE_X_SELECTION_PRIMARY)) + { + elm_entry_select_none(data); + } + return 1; */ return ECORE_CALLBACK_PASS_ON; } Modified: trunk/elementary/src/lib/elm_flipselector.c =================================================================== --- trunk/elementary/src/lib/elm_flipselector.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_flipselector.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -32,7 +32,8 @@ #define DATA_GET eina_list_data_get -struct _Elm_Flipselector_Item { +struct _Elm_Flipselector_Item +{ Elm_Widget_Item base; const char *label; Evas_Smart_Cb func; @@ -42,7 +43,8 @@ typedef struct _Widget_Data Widget_Data; -struct _Widget_Data { +struct _Widget_Data +{ Evas_Object *self; Evas_Object *base; Eina_List *items; Modified: trunk/elementary/src/lib/elm_list.c =================================================================== --- trunk/elementary/src/lib/elm_list.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_list.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -84,12 +84,12 @@ Evas_Callback_Type type, void *event_info); static Eina_Bool _deselect_all_items(Widget_Data *wd); -#define ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, ...) \ +#define ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, ...) \ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); \ -if (it->deleted) \ -{ \ - ERR("ERROR: "#it" has been DELETED.\n"); \ - return __VA_ARGS__; \ +if (it->deleted) \ +{ \ + ERR("ERROR: "#it" has been DELETED.\n"); \ + return __VA_ARGS__; \ } static inline void Modified: trunk/elementary/src/lib/elm_map.c =================================================================== --- trunk/elementary/src/lib/elm_map.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_map.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -682,8 +682,8 @@ evas_object_resize(gi->img, ww, hh); /*evas_object_move(gi->txt, - xx - px + ax + ox, - yy - py + ay + oy); + xx - px + ax + ox, + yy - py + ay + oy); evas_object_resize(gi->txt, ww, hh); */ @@ -958,14 +958,14 @@ evas_object_pass_events_set(gi->img, EINA_TRUE); evas_object_stack_below(gi->img, wd->sep_maps_markers); - /*gi->txt = evas_object_text_add(evas_object_evas_get(obj)); - evas_object_text_font_set(gi->txt, "Vera", 12); - evas_object_color_set(gi->txt, 100, 100, 100, 255); - evas_object_smart_member_add(gi->txt, - wd->pan_smart); - elm_widget_sub_object_add(obj, gi->txt); - evas_object_pass_events_set(gi->txt, EINA_TRUE); - */ +/* gi->txt = evas_object_text_add(evas_object_evas_get(obj)); + evas_object_text_font_set(gi->txt, "Vera", 12); + evas_object_color_set(gi->txt, 100, 100, 100, 255); + evas_object_smart_member_add(gi->txt, + wd->pan_smart); + elm_widget_sub_object_add(obj, gi->txt); + evas_object_pass_events_set(gi->txt, EINA_TRUE); +*/ eina_matrixsparse_data_idx_set(g->grid, y, x, gi); } Modified: trunk/elementary/src/lib/elm_pager.c =================================================================== --- trunk/elementary/src/lib/elm_pager.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_pager.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -189,7 +189,7 @@ if (!wd) return; evas_object_geometry_get(obj, &x, &y, NULL, NULL); EINA_LIST_FOREACH(wd->stack, l, it) - evas_object_move(it->base, x, y); + evas_object_move(it->base, x, y); } static void Modified: trunk/elementary/src/lib/elm_photocam.c =================================================================== --- trunk/elementary/src/lib/elm_photocam.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_photocam.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -68,9 +68,9 @@ Widget_Data *wd; Evas_Object *img; struct - { - int x, y, w, h; - } src, out; + { + int x, y, w, h; + } src, out; Eina_Bool want : 1; Eina_Bool have : 1; }; @@ -104,20 +104,20 @@ Ecore_Animator *zoom_animator; double t_start, t_end; struct - { - int imw, imh; - int w, h; - int ow, oh, nw, nh; - struct - { - double x, y; - } spos; - } size; + { + int imw, imh; + int w, h; + int ow, oh, nw, nh; + struct + { + double x, y; + } spos; + } size; struct - { - Eina_Bool show : 1; - Evas_Coord x, y ,w ,h; - } show; + { + Eina_Bool show : 1; + Evas_Coord x, y ,w ,h; + } show; int tsize; Evas_Object *img; // low res version of image (scale down == 8) int nosmooth; @@ -729,16 +729,16 @@ } /* - static void - _show_region_hook(void *data, Evas_Object *obj) - { +static void +_show_region_hook(void *data, Evas_Object *obj) +{ Widget_Data *wd = elm_widget_data_get(data); Evas_Coord x, y, w, h; if (!wd) return; elm_widget_show_region_get(obj, &x, &y, &w, &h); elm_smart_scroller_child_region_show(wd->scr, x, y, w, h); - } - */ +} +*/ static void _sizing_eval(Evas_Object *obj) Modified: trunk/elementary/src/lib/elm_priv.h =================================================================== --- trunk/elementary/src/lib/elm_priv.h 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_priv.h 2011-04-01 19:08:56 UTC (rev 58267) @@ -158,7 +158,7 @@ void _elm_widget_type_clear(void); void _elm_widget_focus_region_show(const Evas_Object *obj); -void _elm_unneed_ethumb(void); +void _elm_unneed_ethumb(void); void _elm_rescale(void); void _elm_widget_mirrored_reload(Evas_Object *obj); Modified: trunk/elementary/src/lib/elm_store.c =================================================================== --- trunk/elementary/src/lib/elm_store.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/elm_store.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -30,50 +30,50 @@ struct _Elm_Store { - EINA_MAGIC; - void (*free)(Elm_Store *store); - struct { - void (*free)(Elm_Store_Item *item); - } item; - Evas_Object *genlist; - Ecore_Thread *list_th; - Eina_Inlist *items; - Eina_List *realized; - int realized_count; - int cache_max; - struct { - struct { - Elm_Store_Item_List_Cb func; - void *data; - } list; - struct { - Elm_Store_Item_Fetch_Cb func; - void *data; - } fetch; - struct { - Elm_Store_Item_Unfetch_Cb func; - void *data; - } unfetch; - } cb; - Eina_Bool sorted : 1; - Eina_Bool fetch_thread : 1; + EINA_MAGIC; + void (*free)(Elm_Store *store); + struct { + void (*free)(Elm_Store_Item *item); + } item; + Evas_Object *genlist; + Ecore_Thread *list_th; + Eina_Inlist *items; + Eina_List *realized; + int realized_count; + int cache_max; + struct { + struct { + Elm_Store_Item_List_Cb func; + void *data; + } list; + struct { + Elm_Store_Item_Fetch_Cb func; + void *data; + } fetch; + struct { + Elm_Store_Item_Unfetch_Cb func; + void *data; + } unfetch; + } cb; + Eina_Bool sorted : 1; + Eina_Bool fetch_thread : 1; }; struct _Elm_Store_Item { - EINA_INLIST; - EINA_MAGIC; - Elm_Store *store; - Elm_Genlist_Item *item; - Ecore_Thread *fetch_th; - Ecore_Job *eval_job; - const Elm_Store_Item_Mapping *mapping; - void *data; - LK(lock); - Eina_Bool live : 1; - Eina_Bool was_live : 1; - Eina_Bool realized : 1; - Eina_Bool fetched : 1; + EINA_INLIST; + EINA_MAGIC; + Elm_Store *store; + Elm_Genlist_Item *item; + Ecore_Thread *fetch_th; + Ecore_Job *eval_job; + const Elm_Store_Item_Mapping *mapping; + void *data; + LK(lock); + Eina_Bool live : 1; + Eina_Bool was_live : 1; + Eina_Bool realized : 1; + Eina_Bool fetched : 1; }; struct _Elm_Store_Filesystem Modified: trunk/elementary/src/lib/els_pan.c =================================================================== --- trunk/elementary/src/lib/els_pan.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/els_pan.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -48,30 +48,30 @@ if (child == sd->child_obj) return; if (sd->child_obj) { - evas_object_clip_unset(sd->child_obj); - evas_object_smart_member_del(sd->child_obj); + evas_object_clip_unset(sd->child_obj); + evas_object_smart_member_del(sd->child_obj); evas_object_event_callback_del_full(sd->child_obj, EVAS_CALLBACK_FREE, _smart_child_del_hook, sd); - evas_object_event_callback_del_full(sd->child_obj, EVAS_CALLBACK_RESIZE, _smart_child_resize_hook, sd); - sd->child_obj = NULL; + evas_object_event_callback_del_full(sd->child_obj, EVAS_CALLBACK_RESIZE, _smart_child_resize_hook, sd); + sd->child_obj = NULL; } if (child) { - Evas_Coord w, h; - int r, g, b, a; + Evas_Coord w, h; + int r, g, b, a; - sd->child_obj = child; - evas_object_smart_member_add(sd->child_obj, sd->smart_obj); - evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h); - sd->child_w = w; - sd->child_h = h; - evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, _smart_child_del_hook, sd); - evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE, _smart_child_resize_hook, sd); - evas_object_color_get(sd->smart_obj, &r, &g, &b, &a); - evas_object_color_set(sd->child_obj, r, g, b, a); - evas_object_clip_set(sd->child_obj, evas_object_clip_get(sd->smart_obj)); - if (evas_object_visible_get(sd->smart_obj)) evas_object_show(sd->child_obj); - else evas_object_hide(sd->child_obj); - _smart_reconfigure(sd); + sd->child_obj = child; + evas_object_smart_member_add(sd->child_obj, sd->smart_obj); + evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h); + sd->child_w = w; + sd->child_h = h; + evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, _smart_child_del_hook, sd); + evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE, _smart_child_resize_hook, sd); + evas_object_color_get(sd->smart_obj, &r, &g, &b, &a); + evas_object_color_set(sd->child_obj, r, g, b, a); + evas_object_clip_set(sd->child_obj, evas_object_clip_get(sd->smart_obj)); + if (evas_object_visible_get(sd->smart_obj)) evas_object_show(sd->child_obj); + else evas_object_hide(sd->child_obj); + _smart_reconfigure(sd); } evas_object_smart_callback_call(sd->smart_obj, "changed", NULL); } @@ -87,10 +87,10 @@ _elm_smart_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { API_ENTRY return; -// if (x > (sd->child_w - sd->w)) x = sd->child_w - sd->w; -// if (y > (sd->child_h - sd->h)) y = sd->child_h - sd->h; -// if (x < 0) x = 0; -// if (y < 0) y = 0; + // if (x > (sd->child_w - sd->w)) x = sd->child_w - sd->w; + // if (y > (sd->child_h - sd->h)) y = sd->child_h - sd->h; + // if (x < 0) x = 0; + // if (y < 0) y = 0; if ((x == sd->px) && (y == sd->py)) return; sd->px = x; sd->py = y; @@ -112,13 +112,13 @@ API_ENTRY return; if (x) { - if (sd->w < sd->child_w) *x = sd->child_w - sd->w; - else *x = 0; + if (sd->w < sd->child_w) *x = sd->child_w - sd->w; + else *x = 0; } if (y) { - if (sd->h < sd->child_h) *y = sd->child_h - sd->h; - else *y = 0; + if (sd->h < sd->child_h) *y = sd->child_h - sd->h; + else *y = 0; } } @@ -161,9 +161,9 @@ evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h); if ((w != sd->child_w) || (h != sd->child_h)) { - sd->child_w = w; - sd->child_h = h; - _smart_reconfigure(sd); + sd->child_w = w; + sd->child_h = h; + _smart_reconfigure(sd); } evas_object_smart_callback_call(sd->smart_obj, "changed", NULL); } @@ -263,28 +263,28 @@ { if (_smart) return; { - static const Evas_Smart_Class sc = - { - SMART_NAME, - EVAS_SMART_CLASS_VERSION, - _smart_add, - _smart_del, - _smart_move, - _smart_resize, - _smart_show, - _smart_hide, - _smart_color_set, - _smart_clip_set, - _smart_clip_unset, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - }; - _smart = evas_smart_class_new(&sc); + static const Evas_Smart_Class sc = + { + SMART_NAME, + EVAS_SMART_CLASS_VERSION, + _smart_add, + _smart_del, + _smart_move, + _smart_resize, + _smart_show, + _smart_hide, + _smart_color_set, + _smart_clip_set, + _smart_clip_unset, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL + }; + _smart = evas_smart_class_new(&sc); } } Modified: trunk/elementary/src/lib/els_scroller.c =================================================================== --- trunk/elementary/src/lib/els_scroller.c 2011-04-01 16:45:05 UTC (rev 58266) +++ trunk/elementary/src/lib/els_scroller.c 2011-04-01 19:08:56 UTC (rev 58267) @@ -684,13 +684,13 @@ dt = t - sd->down.anim_start3; if (dt >= 0.0) { - dt = dt / _elm_config->thumbscroll_bounce_friction; - if (dt > 1.0) dt = 1.0; - p = 1.0 - ((1.0 - dt) * (1.0 - dt)); + dt = dt / _elm_config->thumbscroll_bounce_friction; + if (dt > 1.0) dt = 1.0; + p = 1.0 - ((1.0 - dt) * (1.0 - dt)); elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); dy = sd->down.b2y - sd->down.by; - dy = (dy * p); - y = sd->down.by + dy; + dy = (dy * p); + y = sd->down.by + dy; if (!sd->down.cancelled) elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); if (dt >= 1.0) |
From: Enlightenment S. <no-...@en...> - 2011-04-03 16:26:32
|
Log: elementary/flip - modified to use smart callbacks descriptions table Author: hermet Date: 2011-04-03 09:26:25 -0700 (Sun, 03 Apr 2011) New Revision: 58306 Trac: http://trac.enlightenment.org/e/changeset/58306 Modified: trunk/elementary/src/lib/elm_flip.c Modified: trunk/elementary/src/lib/elm_flip.c =================================================================== --- trunk/elementary/src/lib/elm_flip.c 2011-04-03 16:15:21 UTC (rev 58305) +++ trunk/elementary/src/lib/elm_flip.c 2011-04-03 16:26:25 UTC (rev 58306) @@ -41,6 +41,13 @@ static void _configure(Evas_Object *obj); +static const char SIG_ANIMATE_DONE[] = "animate,done"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_ANIMATE_DONE, ""}, + {NULL, NULL} +}; + static void _del_hook(Evas_Object *obj) { @@ -344,7 +351,7 @@ wd->animator = NULL; wd->state = !wd->state; _configure(obj); - evas_object_smart_callback_call(obj, "animate,done", NULL); + evas_object_smart_callback_call(obj, SIG_ANIMATE_DONE, NULL); return ECORE_CALLBACK_CANCEL; } return ECORE_CALLBACK_RENEW; @@ -449,9 +456,12 @@ evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL); evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + wd->state = 1; _sizing_eval(obj); + return obj; } |
From: Enlightenment S. <no-...@en...> - 2011-04-03 16:35:26
|
Log: elementary / ctxpopup - modified doxygen smart object signal callbacks Author: hermet Date: 2011-04-03 09:35:19 -0700 (Sun, 03 Apr 2011) New Revision: 58307 Trac: http://trac.enlightenment.org/e/changeset/58307 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-04-03 16:26:25 UTC (rev 58306) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-04-03 16:35:19 UTC (rev 58307) @@ -14,7 +14,7 @@ * * Signals that you can add callbacks for are: * - * dismissed - the ctxpopup was dismissed + * "dismissed" - the ctxpopup was dismissed */ typedef struct _Widget_Data Widget_Data; |
From: Enlightenment S. <no-...@en...> - 2011-04-04 01:55:03
|
Log: elementary / transit - modified internal namings . Elm_Transit_Effect -> Elm_Transit_Effect_Module Author: hermet Date: 2011-04-03 18:54:55 -0700 (Sun, 03 Apr 2011) New Revision: 58310 Trac: http://trac.enlightenment.org/e/changeset/58310 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-03 19:34:23 UTC (rev 58309) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-04 01:54:55 UTC (rev 58310) @@ -86,7 +86,7 @@ Eina_Bool state_keep : 1; }; -struct _Elm_Transit_Effect +struct _Elm_Transit_Effect_Module { void (*animation_op) (void *data, Elm_Transit *transit, double progress); void (*user_data_free) (void *data, Elm_Transit *transit); @@ -110,7 +110,7 @@ Eina_Bool pass_events : 1; }; -typedef struct _Elm_Transit_Effect Elm_Transit_Effect; +typedef struct _Elm_Transit_Effect_Module Elm_Transit_Effect_Module; typedef struct _Elm_Obj_Data Elm_Obj_Data; typedef struct _Elm_Obj_State Elm_Obj_State; @@ -190,26 +190,26 @@ } static void -_elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect *effect, Eina_List *elist) +_elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module, Eina_List *elist) { - if (effect->user_data_free) - effect->user_data_free(effect->user_data, transit); + if (effect_module->user_data_free) + effect_module->user_data_free(effect_module->user_data, transit); transit->effect_list = eina_list_remove_list(transit->effect_list, elist); - free(effect); + free(effect_module); } static void _remove_dead_effects(Elm_Transit *transit) { Eina_List *elist, *elist_next; - Elm_Transit_Effect *effect; + Elm_Transit_Effect_Module *effect_module; - EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect) + EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect_module) { - if (effect->deleted) + if (effect_module->deleted) { - _elm_transit_effect_del(transit, effect, elist); + _elm_transit_effect_del(transit, effect_module, elist); transit->effects_pending_del--; if (!transit->effects_pending_del) return; } @@ -220,13 +220,13 @@ _elm_transit_del(Elm_Transit *transit) { Eina_List *elist, *elist_next; - Elm_Transit_Effect *effect; + Elm_Transit_Effect_Module *effect_module; if (transit->animator) ecore_animator_del(transit->animator); - EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect) - _elm_transit_effect_del(transit, effect, elist); + EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect_module) + _elm_transit_effect_del(transit, effect_module, elist); while (transit->objs) _elm_transit_object_remove(transit, eina_list_data_get(transit->objs)); @@ -242,14 +242,14 @@ _transit_animate_op(Elm_Transit *transit, double progress) { Eina_List *elist; - Elm_Transit_Effect *effect; + Elm_Transit_Effect_Module *effect_module; transit->walking++; - EINA_LIST_FOREACH(transit->effect_list, elist, effect) + EINA_LIST_FOREACH(transit->effect_list, elist, effect_module) { if (transit->deleted) break; - if (!effect->deleted) - effect->animation_op(effect->user_data, transit, progress); + if (!effect_module->deleted) + effect_module->animation_op(effect_module->user_data, transit, progress); } transit->walking--; @@ -406,20 +406,20 @@ { ELM_TRANSIT_CHECK_OR_RETURN(transit); EINA_SAFETY_ON_NULL_RETURN(cb); - Elm_Transit_Effect *effect; + Elm_Transit_Effect_Module *effect_module; Eina_List *elist; - EINA_LIST_FOREACH(transit->effect_list, elist, effect) - if ((effect->animation_op == cb) && (effect->user_data == data)) return; + EINA_LIST_FOREACH(transit->effect_list, elist, effect_module) + if ((effect_module->animation_op == cb) && (effect_module->user_data == data)) return; - effect = ELM_NEW(Elm_Transit_Effect); - if (!effect) return; + effect_module = ELM_NEW(Elm_Transit_Effect_Module); + if (!effect_module) return; - effect->user_data_free = data_free_cb; - effect->animation_op = cb; - effect->user_data = data; + effect_module->user_data_free = data_free_cb; + effect_module->animation_op = cb; + effect_module->user_data = data; - transit->effect_list = eina_list_append(transit->effect_list, effect); + transit->effect_list = eina_list_append(transit->effect_list, effect_module); } /** @@ -446,20 +446,20 @@ ELM_TRANSIT_CHECK_OR_RETURN(transit); EINA_SAFETY_ON_NULL_RETURN(cb); Eina_List *elist, *elist_next; - Elm_Transit_Effect *effect; + Elm_Transit_Effect_Module *effect_module; - EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect) + EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect_module) { - if ((effect->animation_op == cb) && (effect->user_data == data)) + if ((effect_module->animation_op == cb) && (effect_module->user_data == data)) { if (transit->walking) { - effect->deleted = EINA_TRUE; + effect_module->deleted = EINA_TRUE; transit->effects_pending_del++; } else { - _elm_transit_effect_del(transit, effect, elist); + _elm_transit_effect_del(transit, effect_module, elist); if (!transit->effect_list) elm_transit_del(transit); } return; |
From: Enlightenment S. <no-...@en...> - 2011-04-04 05:27:31
|
Log: Elementary/transit - defined transit callback functions types. (Elm_Transit_Effect_Transition_Cb, Elm_Transit_Effect_End_Cb) Author: hermet Date: 2011-04-03 22:27:20 -0700 (Sun, 03 Apr 2011) New Revision: 58312 Trac: http://trac.enlightenment.org/e/changeset/58312 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-04-04 04:48:51 UTC (rev 58311) +++ trunk/elementary/src/lib/Elementary.h.in 2011-04-04 05:27:20 UTC (rev 58312) @@ -2538,11 +2538,13 @@ typedef struct _Elm_Transit Elm_Transit; typedef void Elm_Transit_Effect; + typedef void (*Elm_Transit_Effect_Transition_Cb) (Elm_Transit_Effect *effect, Elm_Transit *transit, double progress); + typedef void (*Elm_Transit_Effect_End_Cb) (Elm_Transit_Effect *effect, Elm_Transit *transit); EAPI Elm_Transit *elm_transit_add(void); EAPI void elm_transit_del(Elm_Transit *transit) EINA_ARG_NONNULL(1); - EAPI void elm_transit_effect_add(Elm_Transit *transit, void (*cb)(Elm_Transit_Effect *effect, Elm_Transit *transit, double progress), Elm_Transit_Effect *effect, void (*effect_free_cb)(Elm_Transit_Effect *effect, Elm_Transit *transit)) EINA_ARG_NONNULL(1, 2); - EAPI void elm_transit_effect_del(Elm_Transit *transit, void (*cb)(Elm_Transit_Effect *effect, Elm_Transit *transit, double progress), Elm_Transit_Effect *effect) EINA_ARG_NONNULL(1, 2); + EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect, Elm_Transit_Effect_End_Cb end_cb) EINA_ARG_NONNULL(1, 2); + EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect) EINA_ARG_NONNULL(1, 2); EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj) EINA_ARG_NONNULL(1, 2); EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj) EINA_ARG_NONNULL(1, 2); EAPI const Eina_List *elm_transit_objects_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-04 04:48:51 UTC (rev 58311) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-04 05:27:20 UTC (rev 58312) @@ -88,9 +88,9 @@ struct _Elm_Transit_Effect_Module { - void (*animation_op) (Elm_Transit_Effect *effect, Elm_Transit *transit, double progress); - void (*user_effect_free) (Elm_Transit_Effect *effect, Elm_Transit *transit); - Elm_Transit_Effect *user_effect; + Elm_Transit_Effect_Transition_Cb transition_cb; + Elm_Transit_Effect_End_Cb end_cb; + Elm_Transit_Effect *effect; Eina_Bool deleted : 1; }; @@ -192,8 +192,8 @@ static void _elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module, Eina_List *elist) { - if (effect_module->user_effect_free) - effect_module->user_effect_free(effect_module->user_effect, transit); + if (effect_module->end_cb) + effect_module->end_cb(effect_module->effect, transit); transit->effect_list = eina_list_remove_list(transit->effect_list, elist); free(effect_module); @@ -249,7 +249,7 @@ { if (transit->deleted) break; if (!effect_module->deleted) - effect_module->animation_op(effect_module->user_effect, transit, progress); + effect_module->transition_cb(effect_module->effect, transit, progress); } transit->walking--; @@ -402,22 +402,22 @@ * the data_free_cb function, do not use the context data in another transit. */ EAPI void -elm_transit_effect_add(Elm_Transit *transit, void (*cb)(Elm_Transit_Effect *effect, Elm_Transit *transit, double progress), Elm_Transit_Effect *effect, void (*effect_free_cb)(Elm_Transit_Effect *effect, Elm_Transit *transit)) +elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect, Elm_Transit_Effect_End_Cb end_cb) { ELM_TRANSIT_CHECK_OR_RETURN(transit); - EINA_SAFETY_ON_NULL_RETURN(cb); + EINA_SAFETY_ON_NULL_RETURN(transition_cb); Elm_Transit_Effect_Module *effect_module; Eina_List *elist; EINA_LIST_FOREACH(transit->effect_list, elist, effect_module) - if ((effect_module->animation_op == cb) && (effect_module->user_effect == effect)) return; + if ((effect_module->transition_cb == transition_cb) && (effect_module->effect == effect)) return; effect_module = ELM_NEW(Elm_Transit_Effect_Module); if (!effect_module) return; - effect_module->user_effect_free = effect_free_cb; - effect_module->animation_op = cb; - effect_module->user_effect = effect; + effect_module->end_cb = end_cb; + effect_module->transition_cb = transition_cb; + effect_module->effect = effect; transit->effect_list = eina_list_append(transit->effect_list, effect_module); } @@ -441,16 +441,16 @@ * @ingroup Transit */ EAPI void -elm_transit_effect_del(Elm_Transit *transit, void (*cb)(Elm_Transit_Effect *effect, Elm_Transit *transit, double progress), Elm_Transit_Effect *effect) +elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect) { ELM_TRANSIT_CHECK_OR_RETURN(transit); - EINA_SAFETY_ON_NULL_RETURN(cb); + EINA_SAFETY_ON_NULL_RETURN(transition_cb); Eina_List *elist, *elist_next; Elm_Transit_Effect_Module *effect_module; EINA_LIST_FOREACH_SAFE(transit->effect_list, elist, elist_next, effect_module) { - if ((effect_module->animation_op == cb) && (effect_module->user_effect == effect)) + if ((effect_module->transition_cb == transition_cb) && (effect_module->effect == effect)) { if (transit->walking) { |
From: Enlightenment S. <no-...@en...> - 2011-04-04 05:57:06
|
Log: elementray / transit - fixed typo Author: hermet Date: 2011-04-03 22:56:56 -0700 (Sun, 03 Apr 2011) New Revision: 58313 Trac: http://trac.enlightenment.org/e/changeset/58313 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-04 05:27:20 UTC (rev 58312) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-04 05:56:56 UTC (rev 58313) @@ -1010,7 +1010,7 @@ _transit_effect_resizing_context_free(Elm_Transit_Effect *effect, Elm_Transit *transit __UNUSED__) { Elm_Transit_Effect_Resizing *resizing = effect; - free(effect); + free(resizing); } static void |
From: Enlightenment S. <no-...@en...> - 2011-04-04 16:34:29
|
Log: elementry / entry, menu, notify, list, gengrid, actionslider, image, icon, anchorview, fileselector_button, calendar, photocam, anchorblock, button, map, colorselector, hover, photo, diskselector, index, bubble, pager, hoversel, check, scrolled_entry, clock, flipselector updated signal callback list in the doxygen. should update genlist, progressbar ... Author: hermet Date: 2011-04-04 09:34:18 -0700 (Mon, 04 Apr 2011) New Revision: 58335 Trac: http://trac.enlightenment.org/e/changeset/58335 Modified: trunk/elementary/src/lib/Elementary.h.in 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_hoversel.c trunk/elementary/src/lib/elc_scrolled_entry.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_calendar.c trunk/elementary/src/lib/elm_check.c trunk/elementary/src/lib/elm_clock.c trunk/elementary/src/lib/elm_colorselector.c trunk/elementary/src/lib/elm_diskselector.c trunk/elementary/src/lib/elm_entry.c trunk/elementary/src/lib/elm_flipselector.c trunk/elementary/src/lib/elm_gengrid.c trunk/elementary/src/lib/elm_hover.c trunk/elementary/src/lib/elm_icon.c trunk/elementary/src/lib/elm_image.c trunk/elementary/src/lib/elm_index.c trunk/elementary/src/lib/elm_list.c trunk/elementary/src/lib/elm_map.c trunk/elementary/src/lib/elm_menu.c trunk/elementary/src/lib/elm_notify.c trunk/elementary/src/lib/elm_pager.c trunk/elementary/src/lib/elm_photo.c trunk/elementary/src/lib/elm_photocam.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/Elementary.h.in 2011-04-04 16:34:18 UTC (rev 58335) @@ -1383,6 +1383,9 @@ EAPI void elm_photo_editable_set(Evas_Object *obj, Eina_Bool set) EINA_ARG_NONNULL(1); /* smart callbacks called: * "clicked" - the user clicked the icon + * "drop" - Something was dropped on the widget + * "drag,start" - Someone started dragging the image out of the object + * "drag,end" - Dragged item was dropped (somewhere) */ /* thumb */ @@ -1842,6 +1845,9 @@ EAPI void elm_check_state_set(Evas_Object *obj, Eina_Bool state); EINA_ARG_NONNULL(1) EAPI Eina_Bool elm_check_state_get(const Evas_Object *obj); EINA_ARG_NONNULL(1) EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep); EINA_ARG_NONNULL(1) + /* smart callbacks called: + * "changed" - This is called whenever the user changes the state of one of the check object. + */ /* radio */ EAPI Evas_Object *elm_radio_add(Evas_Object *parent) EINA_ARG_NONNULL(1); @@ -1870,6 +1876,9 @@ * fade_translucide * fade_invisible */ + /* smart callbacks called: + * "hide,finished" - when the previous page is hided + */ typedef struct _Elm_Slideshow_Item_Class Elm_Slideshow_Item_Class; typedef struct _Elm_Slideshow_Item_Class_Func Elm_Slideshow_Item_Class_Func; Modified: trunk/elementary/src/lib/elc_anchorblock.c =================================================================== --- trunk/elementary/src/lib/elc_anchorblock.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elc_anchorblock.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -12,8 +12,8 @@ * * Signals that you can add callbacks for are: * - * anchor,clicked - anchor called was clicked. event_info is anchor info - - * Elm_Entry_Anchorview_Info + * "anchor,clicked" - anchor called was clicked. event_info is anchor info - + * Elm_Entry_Anchorview_Info */ typedef struct _Widget_Data Widget_Data; typedef struct _Elm_Anchorblock_Item_Provider Elm_Anchorblock_Item_Provider; Modified: trunk/elementary/src/lib/elc_anchorview.c =================================================================== --- trunk/elementary/src/lib/elc_anchorview.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elc_anchorview.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -9,8 +9,8 @@ * * Signals that you can add callbacks for are: * - * anchor,clicked - achor called was clicked. event_info is anchor info - - * Elm_Entry_Anchorview_Info + * "anchor,clicked" - achor called was clicked. event_info is anchor info - + * Elm_Entry_Anchorview_Info */ typedef struct _Widget_Data Widget_Data; typedef struct _Elm_Anchorview_Item_Provider Elm_Anchorview_Item_Provider; Modified: trunk/elementary/src/lib/elc_fileselector_button.c =================================================================== --- trunk/elementary/src/lib/elc_fileselector_button.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elc_fileselector_button.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -8,6 +8,12 @@ * window) with an Elementary File Selector within. When a file is * chosen, the (inner) window is closed and the selected file is * exposed as an evas_object_smart_callback_call() of the button. + * + * Signals that you can add callbacks for are: + * + * "file,chosen" - the user has selected a path, whose string pointer comes + * as event info + * */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/elementary/src/lib/elc_hoversel.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elc_hoversel.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -12,12 +12,10 @@ * * Signals that you can add callbacks for are: * - * clicked - the user clicked the hoversel button and popped up the sel - * - * selected - an item in the hoversel list is selected. event_info is the item - * selected - Elm_Hoversel_Item - * - * dismissed - the hover is dismissed + * "clicked" - the user clicked the hoversel button and popped up the sel + * "selected" - an item in the hoversel list is selected. event_info is the item + * "selected" - Elm_Hoversel_Item + * "dismissed" - the hover is dismissed */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elc_scrolled_entry.c =================================================================== --- trunk/elementary/src/lib/elc_scrolled_entry.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elc_scrolled_entry.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -12,22 +12,23 @@ * widget. * * Signals that you can add callbacks for are: - * - "changed" - The text within the entry was changed - * - "activated" - The entry has received focus and the cursor - * - "press" - The entry has been clicked - * - "longpressed" - The entry has been clicked for a couple seconds - * - "clicked" - The entry has been clicked - * - "clicked,double" - The entry has been double clicked - * - "focused" - The entry has received focus - * - "unfocused" - The entry has lost focus - * - "selection,paste" - A paste action has occurred - * - "selection,copy" - A copy action has occurred - * - "selection,cut" - A cut action has occurred - * - "selection,start" - A selection has begun - * - "selection,changed" - The selection has changed - * - "selection,cleared" - The selection has been cleared - * - "cursor,changed" - The cursor has changed - * - "anchor,clicked" - The anchor has been clicked + * + * "changed" - The text within the entry was changed + * "activated" - The entry has received focus and the cursor + * "press" - The entry has been clicked + * "longpressed" - The entry has been clicked for a couple seconds + * "clicked" - The entry has been clicked + * "clicked,double" - The entry has been double clicked + * "focused" - The entry has received focus + * "unfocused" - The entry has lost focus + * "selection,paste" - A paste action has occurred + * "selection,copy" - A copy action has occurred + * "selection,cut" - A cut action has occurred + * "selection,start" - A selection has begun + * "selection,changed" - The selection has changed + * "selection,cleared" - The selection has been cleared + * "cursor,changed" - The cursor has changed + * "anchor,clicked" - The anchor has been clicked */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_actionslider.c =================================================================== --- trunk/elementary/src/lib/elm_actionslider.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_actionslider.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -5,11 +5,12 @@ * magnet properties. When the position is set with magnet, the knob * will be moved to it if it's nearest the magnetized position. * - * Signals emmitted: + * Signals that you can add callbacks for are: + * * "selected" - when user selects a position (the label is passed as - * event info)". + * event info)". * "pos_changed" - when a button reaches to the special position like - * "left", "right" and "center". + * "left", "right" and "center". */ #include <Elementary.h> Modified: trunk/elementary/src/lib/elm_bubble.c =================================================================== --- trunk/elementary/src/lib/elm_bubble.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_bubble.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -9,7 +9,7 @@ * * Signals that you can add callbacks for are: * - * clicked - This is called when a user has clicked the bubble. + * "clicked" - This is called when a user has clicked the bubble. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_button.c =================================================================== --- trunk/elementary/src/lib/elm_button.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_button.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -6,6 +6,12 @@ * * This is a push-button. Press it and run some function. It can contain * a simple label and icon object. + * + * Signals that you can add callbacks for are: + * + * "clicked" - the user clicked the button + * "repeated" - the user pressed the button without releasing it + * "unpressed" - when the button is unpressed (released) */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_calendar.c =================================================================== --- trunk/elementary/src/lib/elm_calendar.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_calendar.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -21,8 +21,8 @@ * * Signals that you can add callbacks for are: * - * changed - emitted when the user selects a day or changes the displayed - * month, what actually changes the selected day as well. + * "changed" - emitted when the user selects a day or changes the displayed + * month, what actually changes the selected day as well. */ typedef enum _Day_Color // EINA_DEPRECATED Modified: trunk/elementary/src/lib/elm_check.c =================================================================== --- trunk/elementary/src/lib/elm_check.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_check.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -6,11 +6,6 @@ * * The check widget allows for toggling a value between true or false (1 or 0). * - * Signals that you can add callbacks for are: - * - * changed - This is called whenever the user changes the state of one of the - * check object. - * * Check objects are a lot like radio objects in layout and functionality * except they do not work as a group, but independently and only toggle the * value of a boolean from false to true (0 or 1). elm_check_state_set() sets @@ -18,6 +13,11 @@ * returns the current state. For convenience, like the radio objects, you * can set a pointer to a boolean directly with elm_check_state_pointer_set() * for it to modify. + * + * Signals that you can add callbacks for are: + * + * "changed" - This is called whenever the user changes the state of one of the + * check object. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_clock.c =================================================================== --- trunk/elementary/src/lib/elm_clock.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_clock.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -7,6 +7,9 @@ * It's a widget to show clock with animation. The update of time is * shown in an animation like the flip of a sheet. * + * Signals that you can add callbacks for are: + * + * "changed" - the user changed the time */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_colorselector.c =================================================================== --- trunk/elementary/src/lib/elm_colorselector.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_colorselector.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -6,6 +6,10 @@ * * By using colorselector, you can select a color. * Colorselector made a color using HSV/HSB mode. + * + * Signals that you can add callbacks for are: + * + * "changed" - when the color value changes */ #define BASE_STEP 360.0 Modified: trunk/elementary/src/lib/elm_diskselector.c =================================================================== --- trunk/elementary/src/lib/elm_diskselector.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_diskselector.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -8,7 +8,8 @@ * It can act like a circular list with round mode and labels can be * reduced for a defined lenght for side items. * - * Signal emitted by this widget: + * Signals that you can add callbacks for are: + * * "selected" - when item is selected (scroller stops) */ Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_entry.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -73,22 +73,24 @@ * The file to load and save to is specified by elm_entry_file_set(). * * Signals that you can add callbacks for are: - * - "changed" - The text within the entry was changed - * - "activated" - The entry has had editing finished and changes are to be committed (generally when enter key is pressed) - * - "press" - The entry has been clicked - * - "longpressed" - The entry has been clicked for a couple seconds - * - "clicked" - The entry has been clicked - * - "clicked,double" - The entry has been double clicked - * - "focused" - The entry has received focus - * - "unfocused" - The entry has lost focus - * - "selection,paste" - A paste action has occurred - * - "selection,copy" - A copy action has occurred - * - "selection,cut" - A cut action has occurred - * - "selection,start" - A selection has begun - * - "selection,changed" - The selection has changed - * - "selection,cleared" - The selection has been cleared - * - "cursor,changed" - The cursor has changed - * - "anchor,clicked" - The anchor has been clicked + * + * "changed" - The text within the entry was changed + * "activated" - The entry has had editing finished and changes are to be committed + (generally when enter key is pressed) + * "press" - The entry has been clicked + * "longpressed" - The entry has been clicked for a couple seconds + * "clicked" - The entry has been clicked + * "clicked,double" - The entry has been double clicked + * "focused" - The entry has received focus + * "unfocused" - The entry has lost focus + * "selection,paste" - A paste action has occurred + * "selection,copy" - A copy action has occurred + * "selection,cut" - A cut action has occurred + * "selection,start" - A selection has begun + * "selection,changed" - The selection has changed + * "selection,cleared" - The selection has been cleared + * "cursor,changed" - The cursor has changed + * "anchor,clicked" - The anchor has been clicked */ typedef struct _Mod_Api Mod_Api; Modified: trunk/elementary/src/lib/elm_flipselector.c =================================================================== --- trunk/elementary/src/lib/elm_flipselector.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_flipselector.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -7,6 +7,14 @@ * A flip selector is a widget to show a set of label items, one at a * time, with an animation when one changes the current selection * (like the flip of calendar sheets, in the default theme). + * + * Signals that you can add callbacks for are: + * + * "selected" - when flipselector selected item is changed + * "overflowed" - when flipselector item is changed to first item + * from last item + * "underflowed" - when flipselector item is changed to last item + * from first item. */ /* TODO: ideally, the default theme would use map{} blocks on the TEXT Modified: trunk/elementary/src/lib/elm_gengrid.c =================================================================== --- trunk/elementary/src/lib/elm_gengrid.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_gengrid.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -10,55 +10,6 @@ * genlist: the user define a class for each item, specifying * functions that will be called at object creation and deletion. * - * Signals that you can add callbacks for are: - * - * clicked,double - The user has double-clicked or pressed enter on - * an item. The event_info parameter is the Gengrid item - * that was double-clicked. - * - * selected - The user has made an item selected. The event_info - * parameter is the Gengrid item that was selected. - * - * unselected - The user has made an item unselected. The event_info - * parameter is the Gengrid item that was unselected. - * - * realized - This is called when the item in the Gengrid is created - * as a real evas object. event_info is the Gengrid item that was - * created. The object may be deleted at any time, so it is up to the - * caller to not use the object pointer from - * elm_gengrid_item_object_get() in a way where it may point to freed - * objects. - * - * unrealized - This is called when the real evas object for this item - * is deleted. event_info is the Gengrid item that was created. - * - * changed - Called when an item is added, removed, resized or moved - * and when gengrid is resized or horizontal property changes. - * - * drag,start,up - Called when the item in the Gengrid has been - * dragged (not scrolled) up. - * - * drag,start,down - Called when the item in the Gengrid has been - * dragged (not scrolled) down. - * - * drag,start,left - Called when the item in the Gengrid has been - * dragged (not scrolled) left. - * - * drag,start,right - Called when the item in the Gengrid has been - * dragged (not scrolled) right. - * - * drag,stop - Called when the item in the Gengrid has stopped being - * dragged. - * - * drag - Called when the item in the Gengrid is being dragged. - * - * scroll - called when the content has been scrolled (moved). - * - * scroll,drag,start - called when dragging the content has started. - * - * scroll,drag,stop - called when dragging the content has stopped. - * - * * A item in the Gengrid can have 0 or more text labels (they can be * regular text or textblock - that's up to the style to determine), 0 * or more icons (which are simply objects swallowed into the Gengrid @@ -150,10 +101,44 @@ * absolutely must have a specific style that overrides any theme the * user or system sets up you can use elm_theme_overlay_add() to add * such a file. + * + * Signals that you can add callbacks for are: * + * "clicked,double" - The user has double-clicked or pressed enter on + * a item. The event_infoparameter is the Gengrid item + * that was double-clicked. + * "selected" - The user has made an item selected. The event_info + * parameter is the Gengrid item that was selected. + * "unselected" - The user has made an item unselected. The event_info + * parameter is the Gengrid item that was unselected. + * "realized" - This is called when the item in the Gengrid is created + * as a real evas object. event_info is the Gengrid item that was + * created. The object may be deleted at any time, so it is up to the + * caller to not use the object pointer from + * elm_gengrid_item_object_get() in a way where it may point to freed + * objects. + * "unrealized" - This is called when the real evas object for this item + * is deleted. event_info is the Gengrid item that was created. + * "changed" - Called when an item is added, removed, resized or moved + * and when gengrid is resized or horizontal property changes. + * "drag,start,up" - Called when the item in the Gengrid has been + * dragged (not scrolled) up. + * "drag,start,down" - Called when the item in the Gengrid has been + * dragged (not scrolled) down. + * "drag,start,left" - Called when the item in the Gengrid has been + * dragged (not scrolled) left. + * "drag,start,right" - Called when the item in the Gengrid has been + * dragged (not scrolled) right. + * "drag,stop" - Called when the item in the Gengrid has stopped being + * dragged. + * "drag" - Called when the item in the Gengrid is being dragged. + * "scroll" - called when the content has been scrolled (moved). + * "scroll,drag,start" - called when dragging the content has started. + * "scroll,drag,stop" - called when dragging the content has stopped. + * * -- * TODO: - * * Handle non-homogeneous objects too. + * Handle non-homogeneous objects too. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_hover.c =================================================================== --- trunk/elementary/src/lib/elm_hover.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_hover.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -11,6 +11,12 @@ * * @note The hover object will take up the entire space of @p target * object. + * + * Signals that you can add callbacks for are: + * + * "clicked" - the user clicked the empty space in the hover to dismiss + * "smart,changed" - a content object placed under the "smart" + * policy was replaced to a new slot direction. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_icon.c =================================================================== --- trunk/elementary/src/lib/elm_icon.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_icon.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -16,7 +16,7 @@ * * Signals that you can add callbacks for are: * - * clicked - This is called when a user has clicked the icon + * "clicked" - This is called when a user has clicked the icon */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_image.c =================================================================== --- trunk/elementary/src/lib/elm_image.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_image.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -11,8 +11,8 @@ * * Signals that you can add callbacks for are: * - * - clicked: This is called when a user has clicked the image - * - drop: Something has been dropped on the image + * "clicked" - This is called when a user has clicked the image + * "drop" - Something has been dropped on the image */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_index.c =================================================================== --- trunk/elementary/src/lib/elm_index.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_index.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -6,6 +6,14 @@ * * An index object is a type of list that categorizes items in it * by letter. + * + * Signals that you can add callbacks for are: + * + * "changed" - when the selected index item changes + * "delay,changed" - when the selected index item changes, but after some small idle period + * "selected" - when the user releases a finger and selects an item + * "level,up" - when the user moves a finger from the first level to the second level + * "level,down" - when the user moves a finger from the second level to the first level */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_list.c =================================================================== --- trunk/elementary/src/lib/elm_list.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_list.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -8,6 +8,17 @@ * * A list is a very simple type of list widget. For more robust * lists, @ref Genlist should probably be used. + * + * Signals that you can add callbacks for are: + * + * "clicked" - when the user double-clicked an item + * "selected" - when the user selected an item + * "unselected" - when the user selected an item + * "longpressed" - an item in the hoversel list is long-pressed + * "scroll,edge,top" - the list is scrolled until the top edge + * "scroll,edge,bottom" - the list is scrolled until the bottom edge + * "scroll,edge,left" - the list is scrolled until the left edge + * "scroll,edge,right" - the list is scrolled until the right edge */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_map.c =================================================================== --- trunk/elementary/src/lib/elm_map.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_map.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -10,38 +10,24 @@ * * Signals that you can add callbacks for are: * - * clicked - This is called when a user has clicked the map without dragging - * around. + * "clicked" - This is called when a user has clicked the map without dragging + * around. + * "press" - This is called when a user has pressed down on the map. + * "longpressed" - This is called when a user has pressed down on the map for + * a long time without dragging around. + * "clicked,double" - This is called when a user has double-clicked the photo. + * "load,detail" - Map detailed data load begins. + * "loaded,detail" - This is called when all parts of the map are loaded. + * "zoom,start" - Zoom animation started. + * "zoom,stop" - Zoom animation stopped. + * "zoom,change" - Zoom changed when using an auto zoom mode. + * "scroll" - the content has been scrolled (moved) + * "scroll,anim,start" - scrolling animation has started + * "scroll,anim,stop" - scrolling animation has stopped + * "scroll,drag,start" - dragging the contents around has started + * "scroll,drag,stop" - dragging the contents around has stopped + * "downloaded" - This is called when map images are downloaded * - * press - This is called when a user has pressed down on the map. - * - * longpressed - This is called when a user has pressed down on the map for - * a long time without dragging around. - * - * clicked,double - This is called when a user has double-clicked the photo. - * - * load,detail - Map detailed data load begins. - * - * loaded,detail - This is called when all parts of the map are loaded. - * - * zoom,start - Zoom animation started. - * - * zoom,stop - Zoom animation stopped. - * - * zoom,change - Zoom changed when using an auto zoom mode. - * - * scroll - the content has been scrolled (moved) - * - * scroll,anim,start - scrolling animation has started - * - * scroll,anim,stop - scrolling animation has stopped - * - * scroll,drag,start - dragging the contents around has started - * - * scroll,drag,stop - dragging the contents around has stopped - * - * downloaded - This is called when map images are downloaded - * * TODO : doxygen */ Modified: trunk/elementary/src/lib/elm_menu.c =================================================================== --- trunk/elementary/src/lib/elm_menu.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_menu.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -8,6 +8,9 @@ * have a sub-menu. The menu object can be used to display a menu on right * click, in a toolbar, anywhere. * + * Signals that you can add callbacks for are: + * + * "clicked" - the user clicked the empty space in the menu to dismiss. event_info is NULL. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_notify.c =================================================================== --- trunk/elementary/src/lib/elm_notify.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_notify.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -11,6 +11,10 @@ * object, if a timeout was set on it, it will <b>automatically</b> * get hidden after that time. * + * Signals that you can add callbacks for are: + * + * "timeout" - when timeout happens on notify and it's hidden + * "block,clicked" - when it's hidden by a click outside of the notify's view */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_pager.c =================================================================== --- trunk/elementary/src/lib/elm_pager.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_pager.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -18,6 +18,11 @@ * needed and is not the top item, just delete it as normal. You can query * which objects are the top and bottom with elm_pager_content_bottom_get() * and elm_pager_content_top_get(). + * + * Signals that you can add callbacks for are: + * + * "hide,finished" - when the previous page is hided + * */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_photo.c =================================================================== --- trunk/elementary/src/lib/elm_photo.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_photo.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -9,10 +9,10 @@ * * Signals that you can add callbacks for are: * - * - clicked: This is called when a user has clicked the photo - * - drop: Something was dropped on the widget - * - drag,start: Someone started dragging the image out of the object - * - drag,end: Dragged item was dropped (somewhere) + * "clicked" - This is called when a user has clicked the photo + * "drop" - Something was dropped on the widget + * "drag,start" - Someone started dragging the image out of the object + * "drag,end" - Dragged item was dropped (somewhere) */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_photocam.c =================================================================== --- trunk/elementary/src/lib/elm_photocam.c 2011-04-04 14:47:19 UTC (rev 58334) +++ trunk/elementary/src/lib/elm_photocam.c 2011-04-04 16:34:18 UTC (rev 58335) @@ -12,42 +12,27 @@ * * Signals that you can add callbacks for are: * - * clicked - This is called when a user has clicked the photo without dragging - * around. + * "clicked" - This is called when a user has clicked the photo without dragging + * around. + * "press" - This is called when a user has pressed down on the photo. + * "longpressed" - This is called when a user has pressed down on the photo for + * a long time without dragging around. + * "clicked,double" - This is called when a user has double-clicked the photo. + * "load" - Photo load begins. + * "loaded" - This is called when the image file load is complete for the first + * view (low resolution blurry version). + * "load,details" - Photo detailed data load begins. + * "loaded,details" - This is called when the image file load is complete for the + * detailed image data (full resolution needed). + * "zoom,start" - Zoom animation started. + * "zoom,stop" - Zoom animation stopped. + * "zoom,change" - Zoom changed when using an auto zoom mode. + * "scroll" - the content has been scrolled (moved) + * "scroll,anim,start" - scrolling animation has started + * "scroll,anim,stop" - scrolling animation has stopped + * "scroll,drag,start" - dragging the contents around has started + * "scroll,drag,stop" - dragging the contents around has stopped * - * press - This is called when a user has pressed down on the photo. - * - * longpressed - This is called when a user has pressed down on the photo for - * a long time without dragging around. - * - * clicked,double - This is called when a user has double-clicked the photo. - * - * load - Photo load begins. - * - * loaded - This is called when the image file load is complete for the first - * view (low resolution blurry version). - * - * load,details - Photo detailed data load begins. - * - * loaded,details - This is called when the image file load is complete for the - * detailed image data (full resolution needed). - * - * zoom,start - Zoom animation started. - * - * zoom,stop - Zoom animation stopped. - * - * zoom,change - Zoom changed when using an auto zoom mode. - * - * scroll - the content has been scrolled (moved) - * - * scroll,anim,start - scrolling animation has started - * - * scroll,anim,stop - scrolling animation has stopped - * - * scroll,drag,start - dragging the contents around has started - * - * scroll,drag,stop - dragging the contents around has stopped - * * --- * * TODO (maybe - optional future stuff): |
From: Enlightenment S. <no-...@en...> - 2011-04-05 02:04:36
|
Log: Elementary / genlist, slider, radio, win toolbar, thumb, toggle, scroller, slideshow, spinner updated signall callback list in each doxygen Author: hermet Date: 2011-04-04 19:04:28 -0700 (Mon, 04 Apr 2011) New Revision: 58342 Trac: http://trac.enlightenment.org/e/changeset/58342 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_genlist.c trunk/elementary/src/lib/elm_radio.c trunk/elementary/src/lib/elm_scroller.c trunk/elementary/src/lib/elm_slider.c trunk/elementary/src/lib/elm_slideshow.c trunk/elementary/src/lib/elm_spinner.c trunk/elementary/src/lib/elm_thumb.c trunk/elementary/src/lib/elm_toggle.c trunk/elementary/src/lib/elm_toolbar.c trunk/elementary/src/lib/elm_win.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/Elementary.h.in 2011-04-05 02:04:28 UTC (rev 58342) @@ -811,15 +811,15 @@ EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj); /* smart callbacks called: - * "edge,left" - * "edge,right" - * "edge,top" - * "edge,bottom" - * "scroll" - * "scroll,anim,start" - * "scroll,anim,stop" - * "scroll,drag,start" - * "scroll,drag,stop" + * "edge,left" - the left edge of the content has been reached + * "edge,right" - the right edge of the content has been reached + * "edge,top" - the top edge of the content has been reached + * "edge,bottom" - the bottom edge of the content has been reached + * "scroll" - the content has been scrolled (moved) + * "scroll,anim,start" - scrolling animation has started + * "scroll,anim,stop" - scrolling animation has stopped + * "scroll,drag,start" - dragging the contents around has started + * "scroll,drag,stop" - dragging the contents around has stopped */ /* label */ @@ -861,7 +861,9 @@ EAPI Eina_Bool elm_toggle_state_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_toggle_state_pointer_set(Evas_Object *obj, Eina_Bool *statep) EINA_ARG_NONNULL(1); /* smart callbacks called: - * "changed" - the user toggled the state + * "changed" - Whenever the toggle value has been changed. Is not called + * until the toggle is released by the cursor (assuming it has been triggered + * by the cursor in the first place). */ /* frame */ @@ -1411,16 +1413,16 @@ /* available styles: * default * noframe - * - * smart callbacks called: - * "clicked" - the user clicked the thumb - * "clicked,double" - the user double clicked the thumb - * "press" - the user pressed the thumb - * "generate,start" - the thumbnail generation started - * "generate,stop" - the thumbnail generation stopped - * "generate,error" - the thumbnail generation failed - * "load,error" - the thumbnail image loading failed */ + /* smart callbacks called: + * "clicked" - This is called when a user has clicked the thumb without dragging around. + * "clicked,double" - This is called when a user has double-clicked the thumb. + * "press" - This is called when a user has pressed down the thumb. + * "generate,start" - The thumbnail generation started. + * "generate,stop" - The generation process stopped. + * "generate,error" - The generation failed. + * "load,error" - The thumbnail image loading failed. + */ /* hoversel */ EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent) EINA_ARG_NONNULL(1); @@ -1695,6 +1697,15 @@ EAPI Eina_Bool elm_slider_inverted_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_slider_indicator_show_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + /* smart callbacks called: + * "changed" - Whenever the slider value is changed by the user. + * "slider,drag,start" - dragging the slider indicator around has started + * "slider,drag,stop" - dragging the slider indicator around has stopped + * "delay,changed" - A short time after the value is changed by the user. + * This will be called only when the user stops dragging for a very short + * period or when they release their finger/mouse, so it avoids possibly + * expensive reactions to the value change. + */ /* actionslider */ typedef enum _Elm_Actionslider_Pos @@ -1834,6 +1845,30 @@ EAPI const char *elm_genlist_item_cursor_style_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); EAPI void elm_genlist_item_cursor_engine_only_set(Elm_Genlist_Item *item, Eina_Bool engine_only) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_genlist_item_cursor_engine_only_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); + /* smart callbacks called: + * "drag,start,up" - This is called when the item in the list has been dragged + * (not scrolled) up. + * "drag,start,down" - This is called when the item in the list has been dragged + * (not scrolled) down. + * "drag,start,left" - This is called when the item in the list has been dragged + * (not scrolled) left. + * "drag,start,right" - This is called when the item in the list has been dragged + * (not scrolled) right. + * "drag,stop" - This is called when the item in the list has stopped being dragged. + * "drag" - This is called when the item in the list is being dragged. + * "longpressed" - This is called when the item is pressed for a certain amount + * of time. By default it's 1 second. + * "scroll,edge,top" - This is called when the genlist is scrolled until the top edge. + * "scroll,edge,bottom" - This is called when the genlist is scrolled until the bottom edge. + * "scroll,edge,left" - This is called when the genlist is scrolled until the left edge. + * "scroll,edge,right" - This is called when the genlist is scrolled until the right edge. + * "multi,swipe,left" - This is called when the genlist is multi-touch swiped left. + * "multi,swipe,right" - This is called when the genlist is multi-touch swiped right. + * "multi,swipe,up" - This is called when the genlist is multi-touch swiped up. + * "multi,swipe,down" - This is called when the genlist is multi-touch swiped down. + * "multi,pinch,out" - This is called when the genlist is multi-touch pinched out. + * "multi,pinch,in" - This is called when the genlist is multi-touch pinched in. + */ /* check */ EAPI Evas_Object *elm_check_add(Evas_Object *parent) EINA_ARG_NONNULL(1); @@ -1862,6 +1897,9 @@ EAPI void elm_radio_value_set(Evas_Object *obj, int value) EINA_ARG_NONNULL(1); EAPI int elm_radio_value_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_radio_value_pointer_set(Evas_Object *obj, int *valuep) EINA_ARG_NONNULL(1); + /* smart callbacks called: + * "changed" - when the radio status is changed + */ /* pager */ EAPI Evas_Object *elm_pager_add(Evas_Object *parent) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elm_genlist.c =================================================================== --- trunk/elementary/src/lib/elm_genlist.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_genlist.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -15,99 +15,6 @@ * complex when it comes to usage. If all you want is a simple list with * icons and a single label, use the normal List object. * - * Signals that you can add callbacks for are: - * - * clicked,double - This is called when a user has double-clicked an item. The - * event_info parameter is the genlist item that was double-clicked. - * - * selected - This is called when a user has made an item selected. The - * event_info parameter is the genlist item that was selected. - * - * unselected - This is called when a user has made an item unselected. The - * event_info parameter is the genlist item that was unselected. - * - * expanded - This is called when elm_genlist_item_expanded_set() is called - * and the item is now meant to be expanded. The event_info parameter is the - * genlist item that was indicated to expand. It is the job of this callback - * to then fill in the child items. - * - * contracted - This is called when elm_genlist_item_expanded_set() is called - * and the item is now meant to be contracted. The event_info parameter is - * the genlist item that was indicated to contract. It is the job of this - * callback to then delete the child items. - * - * expand,request - This is called when a user has indicated they want to - * expand a tree branch item. The callback should decide if the item can - * expand (has any children) and then call elm_genlist_item_expanded_set() - * appropriately to set the state. The event_info parameter is the genlist - * item that was indicated to expand. - * - * contract,request - This is called when a user has indicated they want to - * contract a tree branch item. The callback should decide if the item can - * contract (has any children) and then call elm_genlist_item_expanded_set() - * appropriately to set the state. The event_info parameter is the genlist - * item that was indicated to contract. - * - * realized - This is called when the item in the list is created as a real - * evas object. event_info parameter is the genlist item that was created. - * The object may be deleted at any time, so it is up to the caller to - * not use the object pointer from elm_genlist_item_object_get() in a way - * where it may point to freed objects. - * - * unrealized - This is called just before an item is unrealized. After - * this call icon objects provided will be deleted and the item object - * itself delete or be put into a floating cache. - * - * drag,start,up - This is called when the item in the list has been dragged - * (not scrolled) up. - * - * drag,start,down - This is called when the item in the list has been dragged - * (not scrolled) down. - * - * drag,start,left - This is called when the item in the list has been dragged - * (not scrolled) left. - * - * drag,start,right - This is called when the item in the list has been dragged - * (not scrolled) right. - * - * drag,stop - This is called when the item in the list has stopped being - * dragged. - * - * drag - This is called when the item in the list is being dragged. - * - * longpressed - This is called when the item is pressed for a certain amount - * of time. By default it's 1 second. - * - * scroll,edge,top - This is called when the genlist is scrolled until the top - * edge. - * - * scroll,edge,bottom - This is called when the genlist is scrolled until the - * bottom edge. - * - * scroll,edge,left - This is called when the genlist is scrolled until the - * left edge. - * - * scroll,edge,right - This is called when the genlist is scrolled until the - * right edge. - * - * multi,swipe,left - This is called when the genlist is multi-touch swiped - * left. - * - * multi,swipe,right - This is called when the genlist is multi-touch swiped - * right. - * - * multi,swipe,up - This is called when the genlist is multi-touch swiped - * up. - * - * multi,swipe,down - This is called when the genlist is multi-touch swiped - * down. - * - * multi,pinch,out - This is called when the genlist is multi-touch pinched - * out. - * - * multi,pinch,in - This is called when the genlist is multi-touch pinched - * in. - * * Genlist has a fairly large API, mostly because it's relatively complex, * trying to be both expansive, powerful and efficient. First we will begin * an overview on the theory behind genlist. @@ -280,6 +187,72 @@ * per application with elm_theme_extension_add(). If you absolutely must * have a specific style that overrides any theme the user or system sets up * you can use elm_theme_overlay_add() to add such a file. + + * clicked,double - This is called when a user has double-clicked an item. The + * event_info parameter is the genlist item that was double-clicked. + * + * selected - This is called when a user has made an item selected. The + * event_info parameter is the genlist item that was selected. + * + * unselected - This is called when a user has made an item unselected. The + * event_info parameter is the genlist item that was unselected. + * + * expanded - This is called when elm_genlist_item_expanded_set() is called + * and the item is now meant to be expanded. The event_info parameter is the + * genlist item that was indicated to expand. It is the job of this callback + * to then fill in the child items. + * + * contracted - This is called when elm_genlist_item_expanded_set() is called + * and the item is now meant to be contracted. The event_info parameter is + * the genlist item that was indicated to contract. It is the job of this + * callback to then delete the child items. + * + * expand,request - This is called when a user has indicated they want to + * expand a tree branch item. The callback should decide if the item can + * expand (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to expand. + * + * contract,request - This is called when a user has indicated they want to + * contract a tree branch item. The callback should decide if the item can + * contract (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to contract. + * + * realized - This is called when the item in the list is created as a real + * evas object. event_info parameter is the genlist item that was created. + * The object may be deleted at any time, so it is up to the caller to + * not use the object pointer from elm_genlist_item_object_get() in a way + * where it may point to freed objects. + * + * unrealized - This is called just before an item is unrealized. After + * this call icon objects provided will be deleted and the item object + * itself delete or be put into a floating cache. + * + * Signals that you can add callbacks for are: + * + * "drag,start,up" - This is called when the item in the list has been dragged + * (not scrolled) up. + * "drag,start,down" - This is called when the item in the list has been dragged + * (not scrolled) down. + * "drag,start,left" - This is called when the item in the list has been dragged + * (not scrolled) left. + * "drag,start,right" - This is called when the item in the list has been dragged + * (not scrolled) right. + * "drag,stop" - This is called when the item in the list has stopped being dragged. + * "drag" - This is called when the item in the list is being dragged. + * "longpressed" - This is called when the item is pressed for a certain amount + * of time. By default it's 1 second. + * "scroll,edge,top" - This is called when the genlist is scrolled until the top edge. + * "scroll,edge,bottom" - This is called when the genlist is scrolled until the bottom edge. + * "scroll,edge,left" - This is called when the genlist is scrolled until the left edge. + * "scroll,edge,right" - This is called when the genlist is scrolled until the right edge. + * "multi,swipe,left" - This is called when the genlist is multi-touch swiped left. + * "multi,swipe,right" - This is called when the genlist is multi-touch swiped right. + * "multi,swipe,up" - This is called when the genlist is multi-touch swiped up. + * "multi,swipe,down" - This is called when the genlist is multi-touch swiped down. + * "multi,pinch,out" - This is called when the genlist is multi-touch pinched out. + * "multi,pinch,in" - This is called when the genlist is multi-touch pinched in. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_radio.c =================================================================== --- trunk/elementary/src/lib/elm_radio.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_radio.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -28,6 +28,11 @@ * the pointer to this integer to modify, use elm_radio_value_pointer_set(). * The radio objects will modify this directly. That implies the pointer must * point to valid memory for as long as the radio objects exist. + * + * Signals that you can add callbacks for are: + * + * "changed" - when the radio status is changed + * */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_scroller.c =================================================================== --- trunk/elementary/src/lib/elm_scroller.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_scroller.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -12,23 +12,15 @@ * * Signals that you can add callbacks for are: * - * edge,left - the left edge of the content has been reached - * - * edge,right - the right edge of the content has been reached - * - * edge,top - the top edge of the content has been reached - * - * edge,bottom - the bottom edge of the content has been reached - * - * scroll - the content has been scrolled (moved) - * - * scroll,anim,start - scrolling animation has started - * - * scroll,anim,stop - scrolling animation has stopped - * - * scroll,drag,start - dragging the contents around has started - * - * scroll,drag,stop - dragging the contents around has stopped + * "edge,left" - the left edge of the content has been reached + * "edge,right" - the right edge of the content has been reached + * "edge,top" - the top edge of the content has been reached + * "edge,bottom" - the bottom edge of the content has been reached + * "scroll" - the content has been scrolled (moved) + * "scroll,anim,start" - scrolling animation has started + * "scroll,anim,stop" - scrolling animation has stopped + * "scroll,drag,start" - dragging the contents around has started + * "scroll,drag,stop" - dragging the contents around has stopped */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_slider.c =================================================================== --- trunk/elementary/src/lib/elm_slider.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_slider.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -7,19 +7,7 @@ * The slider adds a dragable “slider” widget for selecting the value of * something within a range. * - * Signals that you can add callbacks for are: * - * changed - Whenever the slider value is changed by the user. - * - * delay,changed - A short time after the value is changed by the user. - * This will be called only when the user stops dragging for a very short - * period or when they release their finger/mouse, so it avoids possibly - * expensive reactions to the value change. - * - * slider,drag,start - dragging the slider indicator around has started - * - * slider,drag,stop - dragging the slider indicator around has stopped - * * A slider can be horizontal or vertical. It can contain an Icon and has a * primary label as well as a units label (that is formatted with floating * point values and thus accepts a printf-style format string, like @@ -37,6 +25,16 @@ * slider is its length (horizontally or vertically). This will be scaled by * the object or applications scaling factor. At any point code can query the * slider for its value with elm_slider_value_get(). + * + * Signals that you can add callbacks for are: + * + * "changed" - Whenever the slider value is changed by the user. + * "slider,drag,start" - dragging the slider indicator around has started + * "slider,drag,stop" - dragging the slider indicator around has stopped + * "delay,changed" - A short time after the value is changed by the user. + * This will be called only when the user stops dragging for a very short + * period or when they release their finger/mouse, so it avoids possibly + * expensive reactions to the value change. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_slideshow.c =================================================================== --- trunk/elementary/src/lib/elm_slideshow.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_slideshow.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -13,6 +13,10 @@ * is displayed the function itc->func.get() is called. This function should create the object, * for example the object can be an evas_object_image or a photocam. When a object is no more * displayed the function itc->func.del() is called, the user can delete the dana associated to the item. + * + * Signals that you can add callbacks for are: + * + * "changed" - when the slideshow switch to another item */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_spinner.c =================================================================== --- trunk/elementary/src/lib/elm_spinner.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_spinner.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -15,12 +15,11 @@ * * Signals that you can add callbacks for are: * - * changed - Whenever the spinner value is changed by the user. - * - * delay,changed - A short time after the value is changed by the user. - * This will be called only when the user stops dragging for a very short - * period or when they release their finger/mouse, so it avoids possibly - * expensive reactions to the value change. + * "changed" - Whenever the spinner value is changed by the user. + * "delay,changed" - A short time after the value is changed by the user. + * This will be called only when the user stops dragging for a very short + * period or when they release their finger/mouse, so it avoids possibly + * expensive reactions to the value change. */ typedef struct _Widget_Data Widget_Data; typedef struct _Elm_Spinner_Special_Value Elm_Spinner_Special_Value; Modified: trunk/elementary/src/lib/elm_thumb.c =================================================================== --- trunk/elementary/src/lib/elm_thumb.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_thumb.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -11,20 +11,14 @@ * * Signals that you can add callbacks for are: * - * clicked - This is called when a user has clicked the thumb without dragging - * around. - * - * clicked,double - This is called when a user has double-clicked the thumb. - * - * press - This is called when a user has pressed down the thumb. - * - * generate,start - The thumbnail generation started. - * - * generate,stop - The generation process stopped. - * - * generate,error - The generation failed. - * - * load,error - The thumbnail image loading failed. + * "clicked" - This is called when a user has clicked the thumb without dragging + * around. + * "clicked,double" - This is called when a user has double-clicked the thumb. + * "press" - This is called when a user has pressed down the thumb. + * "generate,start" - The thumbnail generation started. + * "generate,stop" - The generation process stopped. + * "generate,error" - The generation failed. + * "load,error" - The thumbnail image loading failed. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/elementary/src/lib/elm_toggle.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_toggle.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -9,7 +9,7 @@ * * Signals that you can add callbacks for are: * - * changed - Whenever the toggle value has been changed. Is not called + * "changed" - Whenever the toggle value has been changed. Is not called * until the toggle is released by the cursor (assuming it has been triggered * by the cursor in the first place). */ Modified: trunk/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/elementary/src/lib/elm_toolbar.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_toolbar.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -6,6 +6,11 @@ * * A toolbar is a widget that displays a list of buttons inside * a box. It is scrollable, and only one item can be selected at a time. + * + * Signals that you can add callbacks for are: + * + * "clicked" - when the user clicks on a toolbar item and becomes selected + * */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_win.c =================================================================== --- trunk/elementary/src/lib/elm_win.c 2011-04-04 23:51:46 UTC (rev 58341) +++ trunk/elementary/src/lib/elm_win.c 2011-04-05 02:04:28 UTC (rev 58342) @@ -6,6 +6,13 @@ * * The window class of Elementary. Contains functions to manipulate * windows. + * + * Signals that you can add callbacks for are: + * + * "delete,request" - the user requested to delete the window + * "focus,in" - window got focus + * "focus,out" - window lost focus + * "moved" - window that holds the canvas was moved */ typedef struct _Elm_Win Elm_Win; |
From: Enlightenment S. <no-...@en...> - 2011-04-05 04:46:44
|
Log: Elementary / genlist - updated signal callback list Author: hermet Date: 2011-04-04 21:46:38 -0700 (Mon, 04 Apr 2011) New Revision: 58344 Trac: http://trac.enlightenment.org/e/changeset/58344 Modified: trunk/elementary/src/lib/Elementary.h.in Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-04-05 04:30:34 UTC (rev 58343) +++ trunk/elementary/src/lib/Elementary.h.in 2011-04-05 04:46:38 UTC (rev 58344) @@ -809,7 +809,6 @@ EAPI void elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) EINA_ARG_NONNULL(1); EAPI void elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation); EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj); - /* smart callbacks called: * "edge,left" - the left edge of the content has been reached * "edge,right" - the right edge of the content has been reached @@ -1846,27 +1845,68 @@ EAPI void elm_genlist_item_cursor_engine_only_set(Elm_Genlist_Item *item, Eina_Bool engine_only) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_genlist_item_cursor_engine_only_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); /* smart callbacks called: - * "drag,start,up" - This is called when the item in the list has been dragged + * "clicked,double" - This is called when a user has double-clicked an item. The + * event_info parameter is the genlist item that was double-clicked. + * "selected" - This is called when a user has made an item selected. The + * event_info parameter is the genlist item that was selected. + * "unselected" - This is called when a user has made an item unselected. The + * event_info parameter is the genlist item that was unselected. + * "expanded" - This is called when elm_genlist_item_expanded_set() is called + * and the item is now meant to be expanded. The event_info parameter is the + * genlist item that was indicated to expand. It is the job of this callback + * to then fill in the child items. + * "contracted" - This is called when elm_genlist_item_expanded_set() is called + * and the item is now meant to be contracted. The event_info parameter is + * the genlist item that was indicated to contract. It is the job of this + * callback to then delete the child items. + * "expand,request" - This is called when a user has indicated they want to + * expand a tree branch item. The callback should decide if the item can + * expand (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to expand. + * "contract,request" - This is called when a user has indicated they want to + * contract a tree branch item. The callback should decide if the item can + * contract (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to contract. + * "realized" - This is called when the item in the list is created as a real + * evas object. event_info parameter is the genlist item that was created. + * The object may be deleted at any time, so it is up to the caller to + * not use the object pointer from elm_genlist_item_object_get() in a way + * where it may point to freed objects. + * "unrealized" - This is called just before an item is unrealized. After + * this call icon objects provided will be deleted and the item object + * itself delete or be put into a floating cache. + * "drag,start,up" - This is called when the item in the list has been dragged * (not scrolled) up. - * "drag,start,down" - This is called when the item in the list has been dragged + * "drag,start,down" - This is called when the item in the list has been dragged * (not scrolled) down. - * "drag,start,left" - This is called when the item in the list has been dragged + * "drag,start,left" - This is called when the item in the list has been dragged i * (not scrolled) left. * "drag,start,right" - This is called when the item in the list has been dragged * (not scrolled) right. - * "drag,stop" - This is called when the item in the list has stopped being dragged. + * "drag,stop" - This is called when the item in the list has stopped being + * dragged. * "drag" - This is called when the item in the list is being dragged. * "longpressed" - This is called when the item is pressed for a certain amount * of time. By default it's 1 second. - * "scroll,edge,top" - This is called when the genlist is scrolled until the top edge. - * "scroll,edge,bottom" - This is called when the genlist is scrolled until the bottom edge. - * "scroll,edge,left" - This is called when the genlist is scrolled until the left edge. - * "scroll,edge,right" - This is called when the genlist is scrolled until the right edge. - * "multi,swipe,left" - This is called when the genlist is multi-touch swiped left. - * "multi,swipe,right" - This is called when the genlist is multi-touch swiped right. + * "scroll,edge,top" - This is called when the genlist is scrolled until the + * top edge. + * "scroll,edge,bottom" - This is called when the genlist is scrolled until the + * bottom edge. + * "scroll,edge,left" - This is called when the genlist is scrolled until the + * left edge. + * "scroll,edge,right" - This is called when the genlist is scrolled until the + * right edge. + * "multi,swipe,left" - This is called when the genlist is multi-touch swiped + * left. + * "multi,swipe,right" - This is called when the genlist is multi-touch swiped + * right. * "multi,swipe,up" - This is called when the genlist is multi-touch swiped up. - * "multi,swipe,down" - This is called when the genlist is multi-touch swiped down. - * "multi,pinch,out" - This is called when the genlist is multi-touch pinched out. + * "multi,swipe,down" - This is called when the genlist is multi-touch swiped + * down. + * "multi,pinch,out" - This is called when the genlist is multi-touch pinched + * out. * "multi,pinch,in" - This is called when the genlist is multi-touch pinched in. */ @@ -2465,7 +2505,6 @@ EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); EINA_DEPRECATED EAPI void elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); - /* smart callbacks called: * changed - emitted when the user select a day or change the displayed * month. |
From: Enlightenment S. <no-...@en...> - 2011-04-05 05:54:03
|
Log: elementary / genlist - updated signal callback list in the doxygen Author: hermet Date: 2011-04-04 22:53:56 -0700 (Mon, 04 Apr 2011) New Revision: 58345 Trac: http://trac.enlightenment.org/e/changeset/58345 Modified: trunk/elementary/src/lib/elm_genlist.c Modified: trunk/elementary/src/lib/elm_genlist.c =================================================================== --- trunk/elementary/src/lib/elm_genlist.c 2011-04-05 04:46:38 UTC (rev 58344) +++ trunk/elementary/src/lib/elm_genlist.c 2011-04-05 05:53:56 UTC (rev 58345) @@ -191,92 +191,67 @@ * Signals that you can add callbacks for are: * * "clicked,double" - This is called when a user has double-clicked an item. The - * event_info parameter is the genlist item that was double-clicked. - * + * event_info parameter is the genlist item that was double-clicked. * "selected" - This is called when a user has made an item selected. The - * event_info parameter is the genlist item that was selected. - * + * event_info parameter is the genlist item that was selected. * "unselected" - This is called when a user has made an item unselected. The - * event_info parameter is the genlist item that was unselected. - * + * event_info parameter is the genlist item that was unselected. * "expanded" - This is called when elm_genlist_item_expanded_set() is called - * and the item is now meant to be expanded. The event_info parameter is the - * genlist item that was indicated to expand. It is the job of this callback - * to then fill in the child items. - * + * and the item is now meant to be expanded. The event_info parameter is the + * genlist item that was indicated to expand. It is the job of this callback + * to then fill in the child items. * "contracted" - This is called when elm_genlist_item_expanded_set() is called - * and the item is now meant to be contracted. The event_info parameter is - * the genlist item that was indicated to contract. It is the job of this - * callback to then delete the child items. - * + * and the item is now meant to be contracted. The event_info parameter is + * the genlist item that was indicated to contract. It is the job of this + * callback to then delete the child items. * "expand,request" - This is called when a user has indicated they want to - * expand a tree branch item. The callback should decide if the item can - * expand (has any children) and then call elm_genlist_item_expanded_set() - * appropriately to set the state. The event_info parameter is the genlist - * item that was indicated to expand. - * + * expand a tree branch item. The callback should decide if the item can + * expand (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to expand. * "contract,request" - This is called when a user has indicated they want to - * contract a tree branch item. The callback should decide if the item can - * contract (has any children) and then call elm_genlist_item_expanded_set() - * appropriately to set the state. The event_info parameter is the genlist - * item that was indicated to contract. - * + * contract a tree branch item. The callback should decide if the item can + * contract (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to contract. * "realized" - This is called when the item in the list is created as a real - * evas object. event_info parameter is the genlist item that was created. - * The object may be deleted at any time, so it is up to the caller to - * not use the object pointer from elm_genlist_item_object_get() in a way - * where it may point to freed objects. - * + * evas object. event_info parameter is the genlist item that was created. + * The object may be deleted at any time, so it is up to the caller to + * not use the object pointer from elm_genlist_item_object_get() in a way + * where it may point to freed objects. * "unrealized" - This is called just before an item is unrealized. After - * this call icon objects provided will be deleted and the item object - * itself delete or be put into a floating cache. - * - * "drag,start,up" - This is called when the item in the list has been dragged - * (not scrolled) up. - * - * "drag,start,down" - This is called when the item in the list has been dragged - * (not scrolled) down. - * - * "drag,start,left" - This is called when the item in the list has been dragged - * (not scrolled) left. - * + * this call icon objects provided will be deleted and the item object + * itself delete or be put into a floating cache. + * "drag,start,up" - This is called when the item in the list has been dragged + * (not scrolled) up. + * "drag,start,down" - This is called when the item in the list has been dragged + * (not scrolled) down. + * "drag,start,left" - This is called when the item in the list has been dragged i + * (not scrolled) left. * "drag,start,right" - This is called when the item in the list has been dragged - * (not scrolled) right. - * + * (not scrolled) right. * "drag,stop" - This is called when the item in the list has stopped being - * dragged. - * + * dragged. * "drag" - This is called when the item in the list is being dragged. - * * "longpressed" - This is called when the item is pressed for a certain amount - * of time. By default it's 1 second. - * + * of time. By default it's 1 second. * "scroll,edge,top" - This is called when the genlist is scrolled until the - * top edge. - * + * top edge. * "scroll,edge,bottom" - This is called when the genlist is scrolled until the - * bottom edge. - * + * bottom edge. * "scroll,edge,left" - This is called when the genlist is scrolled until the - * left edge. - * + * left edge. * "scroll,edge,right" - This is called when the genlist is scrolled until the - * right edge. - * + * right edge. * "multi,swipe,left" - This is called when the genlist is multi-touch swiped - * left. - * + * left. * "multi,swipe,right" - This is called when the genlist is multi-touch swiped - * right. - * + * right. * "multi,swipe,up" - This is called when the genlist is multi-touch swiped up. - * * "multi,swipe,down" - This is called when the genlist is multi-touch swiped - * down. - * + * down. * "multi,pinch,out" - This is called when the genlist is multi-touch pinched - * out. - * + * out. * "multi,pinch,in" - This is called when the genlist is multi-touch pinched in. */ |
From: Enlightenment S. <no-...@en...> - 2011-04-05 06:01:34
|
Log: elementary/genlist - updated signal callback list in doxygen Author: hermet Date: 2011-04-04 23:01:28 -0700 (Mon, 04 Apr 2011) New Revision: 58346 Trac: http://trac.enlightenment.org/e/changeset/58346 Modified: trunk/elementary/src/lib/elm_genlist.c Modified: trunk/elementary/src/lib/elm_genlist.c =================================================================== --- trunk/elementary/src/lib/elm_genlist.c 2011-04-05 05:53:56 UTC (rev 58345) +++ trunk/elementary/src/lib/elm_genlist.c 2011-04-05 06:01:28 UTC (rev 58346) @@ -191,45 +191,49 @@ * Signals that you can add callbacks for are: * * "clicked,double" - This is called when a user has double-clicked an item. The - * event_info parameter is the genlist item that was double-clicked. + * event_info parameter is the genlist item that was double-c + * licked. * "selected" - This is called when a user has made an item selected. The * event_info parameter is the genlist item that was selected. * "unselected" - This is called when a user has made an item unselected. The * event_info parameter is the genlist item that was unselected. * "expanded" - This is called when elm_genlist_item_expanded_set() is called - * and the item is now meant to be expanded. The event_info parameter is the - * genlist item that was indicated to expand. It is the job of this callback - * to then fill in the child items. + * and the item is now meant to be expanded. The event_info + * parameter is the genlist item that was indicated to expand. It + * is the job of this callback to then fill in the child items. * "contracted" - This is called when elm_genlist_item_expanded_set() is called - * and the item is now meant to be contracted. The event_info parameter is - * the genlist item that was indicated to contract. It is the job of this - * callback to then delete the child items. + * and the item is now meant to be contracted. The event_info + * parameter is the genlist item that was indicated to contract. + * It is the job of this callback to then delete the child items. * "expand,request" - This is called when a user has indicated they want to - * expand a tree branch item. The callback should decide if the item can - * expand (has any children) and then call elm_genlist_item_expanded_set() - * appropriately to set the state. The event_info parameter is the genlist - * item that was indicated to expand. + * expand a tree branch item. The callback should decide if + * the item can expand (has any children) and then call + * elm_genlist_item_expanded_set() appropriately to set the + * state. The event_info parameter is the genlist item that + * was indicated to expand. * "contract,request" - This is called when a user has indicated they want to - * contract a tree branch item. The callback should decide if the item can - * contract (has any children) and then call elm_genlist_item_expanded_set() - * appropriately to set the state. The event_info parameter is the genlist + * contract a tree branch item. The callback should decide + * if the item can contract (has any children) and then + * call elm_genlist_item_expanded_set() appropriately to + * set the state. The event_info parameter is the genlist * item that was indicated to contract. * "realized" - This is called when the item in the list is created as a real - * evas object. event_info parameter is the genlist item that was created. - * The object may be deleted at any time, so it is up to the caller to - * not use the object pointer from elm_genlist_item_object_get() in a way - * where it may point to freed objects. - * "unrealized" - This is called just before an item is unrealized. After - * this call icon objects provided will be deleted and the item object + * evas object. event_info parameter is the genlist item that was + * created. The object may be deleted at any time, so it is up to + * the caller to not use the object pointer from + * elm_genlist_item_object_get() in a way where it may point to + * freed objects. + * "unrealized" - This is called just before an item is unrealized. After this + * call icon objects provided will be deleted and the item object * itself delete or be put into a floating cache. - * "drag,start,up" - This is called when the item in the list has been dragged + * "drag,start,up" - This is called when the item in the list has been dragged * (not scrolled) up. - * "drag,start,down" - This is called when the item in the list has been dragged + * "drag,start,down" - This is called when the item in the list has been dragged * (not scrolled) down. - * "drag,start,left" - This is called when the item in the list has been dragged i + * "drag,start,left" - This is called when the item in the list has been dragged * (not scrolled) left. - * "drag,start,right" - This is called when the item in the list has been dragged - * (not scrolled) right. + * "drag,start,right" - This is called when the item in the list has been + * dragged (not scrolled) right. * "drag,stop" - This is called when the item in the list has stopped being * dragged. * "drag" - This is called when the item in the list is being dragged. |
From: Enlightenment S. <no-...@en...> - 2011-04-05 07:04:17
|
Log: elementary / menu, gengrid, slider, separator, photocam, index, toggle updated signal callback list in the doxygen Author: hermet Date: 2011-04-05 00:04:09 -0700 (Tue, 05 Apr 2011) New Revision: 58347 Trac: http://trac.enlightenment.org/e/changeset/58347 Modified: trunk/elementary/src/lib/elm_gengrid.c trunk/elementary/src/lib/elm_index.c trunk/elementary/src/lib/elm_menu.c trunk/elementary/src/lib/elm_photocam.c trunk/elementary/src/lib/elm_separator.c trunk/elementary/src/lib/elm_slider.c trunk/elementary/src/lib/elm_toggle.c Modified: trunk/elementary/src/lib/elm_gengrid.c =================================================================== --- trunk/elementary/src/lib/elm_gengrid.c 2011-04-05 06:01:28 UTC (rev 58346) +++ trunk/elementary/src/lib/elm_gengrid.c 2011-04-05 07:04:09 UTC (rev 58347) @@ -113,10 +113,10 @@ * parameter is the Gengrid item that was unselected. * "realized" - This is called when the item in the Gengrid is created * as a real evas object. event_info is the Gengrid item that was - * created. The object may be deleted at any time, so it is up to the - * caller to not use the object pointer from - * elm_gengrid_item_object_get() in a way where it may point to freed - * objects. + * created. The object may be deleted at any time, so it is up to + * the caller to not use the object pointer from + * elm_gengrid_item_object_get() in a way where it may point to + * freed objects. * "unrealized" - This is called when the real evas object for this item * is deleted. event_info is the Gengrid item that was created. * "changed" - Called when an item is added, removed, resized or moved Modified: trunk/elementary/src/lib/elm_index.c =================================================================== --- trunk/elementary/src/lib/elm_index.c 2011-04-05 06:01:28 UTC (rev 58346) +++ trunk/elementary/src/lib/elm_index.c 2011-04-05 07:04:09 UTC (rev 58347) @@ -10,10 +10,12 @@ * Signals that you can add callbacks for are: * * "changed" - when the selected index item changes - * "delay,changed" - when the selected index item changes, but after some small idle period + * "delay,changed" - when the selected index item changes, but after some small i + * dle period * "selected" - when the user releases a finger and selects an item - * "level,up" - when the user moves a finger from the first level to the second level - * "level,down" - when the user moves a finger from the second level to the first level + * "level,up" - when the user moves a finger from the first level to the second + * level + * "level,down" - when the user moves a finger from the second level to the first * level */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_menu.c =================================================================== --- trunk/elementary/src/lib/elm_menu.c 2011-04-05 06:01:28 UTC (rev 58346) +++ trunk/elementary/src/lib/elm_menu.c 2011-04-05 07:04:09 UTC (rev 58347) @@ -10,7 +10,8 @@ * * Signals that you can add callbacks for are: * - * "clicked" - the user clicked the empty space in the menu to dismiss. event_info is NULL. + * "clicked" - the user clicked the empty space in the menu to dismiss. + * event_info is NULL. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_photocam.c =================================================================== --- trunk/elementary/src/lib/elm_photocam.c 2011-04-05 06:01:28 UTC (rev 58346) +++ trunk/elementary/src/lib/elm_photocam.c 2011-04-05 07:04:09 UTC (rev 58347) @@ -22,8 +22,8 @@ * "loaded" - This is called when the image file load is complete for the first * view (low resolution blurry version). * "load,details" - Photo detailed data load begins. - * "loaded,details" - This is called when the image file load is complete for the - * detailed image data (full resolution needed). + * "loaded,details" - This is called when the image file load is complete for + * the detailed image data (full resolution needed). * "zoom,start" - Zoom animation started. * "zoom,stop" - Zoom animation stopped. * "zoom,change" - Zoom changed when using an auto zoom mode. Modified: trunk/elementary/src/lib/elm_separator.c =================================================================== --- trunk/elementary/src/lib/elm_separator.c 2011-04-05 06:01:28 UTC (rev 58346) +++ trunk/elementary/src/lib/elm_separator.c 2011-04-05 07:04:09 UTC (rev 58347) @@ -4,7 +4,8 @@ /** * @defgroup Separator Separator * - * A separator is a widget that adds a very thin object to separate other objects. + * A separator is a widget that adds a very thin object to separate other + * objects. * A separator can be vertical or horizontal. */ Modified: trunk/elementary/src/lib/elm_slider.c =================================================================== --- trunk/elementary/src/lib/elm_slider.c 2011-04-05 06:01:28 UTC (rev 58346) +++ trunk/elementary/src/lib/elm_slider.c 2011-04-05 07:04:09 UTC (rev 58347) @@ -32,9 +32,10 @@ * "slider,drag,start" - dragging the slider indicator around has started * "slider,drag,stop" - dragging the slider indicator around has stopped * "delay,changed" - A short time after the value is changed by the user. - * This will be called only when the user stops dragging for a very short - * period or when they release their finger/mouse, so it avoids possibly - * expensive reactions to the value change. + * This will be called only when the user stops dragging for + * a very short period or when they release their + * finger/mouse, so it avoids possibly expensive reactions to + * the value change. */ typedef struct _Widget_Data Widget_Data; Modified: trunk/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/elementary/src/lib/elm_toggle.c 2011-04-05 06:01:28 UTC (rev 58346) +++ trunk/elementary/src/lib/elm_toggle.c 2011-04-05 07:04:09 UTC (rev 58347) @@ -9,9 +9,9 @@ * * Signals that you can add callbacks for are: * - * "changed" - Whenever the toggle value has been changed. Is not called - * until the toggle is released by the cursor (assuming it has been triggered - * by the cursor in the first place). + * "changed" - Whenever the toggle value has been changed. Is not called until + * the toggle is released by the cursor (assuming it has been + * triggered by the cursor in the first place). */ typedef struct _Widget_Data Widget_Data; |
From: Enlightenment S. <no-...@en...> - 2011-04-07 05:34:18
|
Log: elementary/transit - added chain transit features. Author: hermet Date: 2011-04-06 22:34:11 -0700 (Wed, 06 Apr 2011) New Revision: 58406 Trac: http://trac.enlightenment.org/e/changeset/58406 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-07 04:54:55 UTC (rev 58405) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-07 05:34:11 UTC (rev 58406) @@ -60,9 +60,11 @@ Ecore_Animator *animator; Eina_List *effect_list; Eina_List *objs; + Elm_Transit *prev_chain_transit; + Eina_List *next_chain_transits; Elm_Transit_Tween_Mode tween_mode; struct { - void (*func) (void *data, Elm_Transit *transit); + Elm_Transit_Effect_End_Cb func; void *arg; } del_data; struct { @@ -221,7 +223,17 @@ { Eina_List *elist, *elist_next; Elm_Transit_Effect_Module *effect_module; + Elm_Transit *chain_transit; + EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) + { + if (transit->prev_chain_transit) + transit->prev_chain_transit->next_chain_transits = eina_list_remove(transit->prev_chain_transit->next_chain_transits, transit); + chain_transit->prev_chain_transit = NULL; + } + + eina_list_free(transit->next_chain_transits); + if (transit->animator) ecore_animator_del(transit->animator); @@ -239,6 +251,16 @@ } static void +_chain_transits_go(Elm_Transit *transit) +{ + Eina_List *elist, *elist_next; + Elm_Transit *chain_transit; + + EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) + elm_transit_go(chain_transit); +} + +static void _transit_animate_op(Elm_Transit *transit, double progress) { Eina_List *elist; @@ -301,6 +323,10 @@ (transit->repeat.current == transit->repeat.count) && ((!transit->auto_reverse) || transit->repeat.reverse)) { + /* run chain transit */ + if (transit->next_chain_transits) + _chain_transits_go(transit); + elm_transit_del(transit); return ECORE_CALLBACK_CANCEL; } @@ -984,7 +1010,7 @@ * @param transit The transit object. * @return EINA_TRUE means the states of the objects will be reset. * If @p transit is NULL, EINA_FALSE is returned - + * * @ingroup Transit */ EAPI Eina_Bool @@ -994,6 +1020,50 @@ return transit->state_keep; } +/** + * Makes the chain relationship between two transits. + * + * @note @p transit can not be NULL. Transit would have multiple chain transits. + * @note @p chain_transit can not be NULL. Chain transits could be chained to the only one transit. + * + * @param transit The transit object. + * @param chain_transit The chain transit object. This transit will be operated * after transit is done. + * + * @ingroup Transit + */ +EAPI void +elm_transit_chain_transit_add(Elm_Transit *transit, Elm_Transit *chain_transit) +{ + ELM_TRANSIT_CHECK_OR_RETURN(transit); + ELM_TRANSIT_CHECK_OR_RETURN(chain_transit); + + if (transit == chain_transit) return; + if (transit == chain_transit->prev_chain_transit) return; + + if (chain_transit->prev_chain_transit) + chain_transit->prev_chain_transit->next_chain_transits = eina_list_remove(chain_transit->prev_chain_transit->next_chain_transits, chain_transit); + + chain_transit->prev_chain_transit = transit; + transit->next_chain_transits = eina_list_append(transit->next_chain_transits, chain_transit); +} + +/** + * Get the current chain transit list. + * + * @note @p transit can not be NULL. + * + * @param transit The transit object. + * @return chain transit list. + * + * @ingroup Transit + */ +EAPI Eina_List * +elm_transit_chain_transits_get(const Elm_Transit * transit) +{ + ELM_TRANSIT_CHECK_OR_RETURN(transit); + return transit->next_chain_transits; +} + /////////////////////////////////////////////////////////////////////////////// //Resizing Effect /////////////////////////////////////////////////////////////////////////////// |
From: Enlightenment S. <no-...@en...> - 2011-04-11 15:56:44
|
Log: elementary / widget - removed semicolon Author: hermet Date: 2011-04-11 08:56:36 -0700 (Mon, 11 Apr 2011) New Revision: 58556 Trac: http://trac.enlightenment.org/e/changeset/58556 Modified: trunk/elementary/src/lib/elm_widget.h Modified: trunk/elementary/src/lib/elm_widget.h =================================================================== --- trunk/elementary/src/lib/elm_widget.h 2011-04-11 15:37:06 UTC (rev 58555) +++ trunk/elementary/src/lib/elm_widget.h 2011-04-11 15:56:36 UTC (rev 58556) @@ -501,7 +501,7 @@ evas = evas_object_evas_get(par); if (!(evas)) return (ret); \ wdat = ELM_NEW(wdtype); if (!(wdat)) return (ret); \ ob = elm_widget_add(evas); if (!(ob)) { free(wdat); return (ret); } \ - } while (0); + } while (0) /** * The drag and drop API. |
From: Enlightenment S. <no-...@en...> - 2011-04-12 05:48:51
|
Log: elementary/transit - added new APIs elm_trnasit_chain_transit_add , elm_transit_chain_transits_get Author: hermet Date: 2011-04-11 22:48:44 -0700 (Mon, 11 Apr 2011) New Revision: 58575 Trac: http://trac.enlightenment.org/e/changeset/58575 Modified: trunk/elementary/src/lib/Elementary.h.in Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-04-12 00:06:57 UTC (rev 58574) +++ trunk/elementary/src/lib/Elementary.h.in 2011-04-12 05:48:44 UTC (rev 58575) @@ -2697,6 +2697,8 @@ EAPI void elm_transit_paused_set(Elm_Transit *transit, Eina_Bool paused) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_transit_paused_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); EAPI double elm_transit_progress_value_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); + EAPI void elm_transit_chain_transit_add(Elm_Transit *transit, Elm_Transit *chain_transit) EINA_ARG_NONNULL(1, 2); + EAPI Eina_List *elm_transit_chain_transits_get(const Elm_Transit *transit); EAPI Elm_Transit_Effect *elm_transit_effect_resizing_add(Elm_Transit* transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h); EAPI Elm_Transit_Effect *elm_transit_effect_translation_add(Elm_Transit* transit, Evas_Coord from_dx, Evas_Coord dy, Evas_Coord to_dx, Evas_Coord to_dy); |
From: Enlightenment S. <no-...@en...> - 2011-04-12 11:05:59
|
Log: elementary/transit - fixed typo Author: hermet Date: 2011-04-12 04:05:52 -0700 (Tue, 12 Apr 2011) New Revision: 58589 Trac: http://trac.enlightenment.org/e/changeset/58589 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-12 09:44:50 UTC (rev 58588) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-12 11:05:52 UTC (rev 58589) @@ -377,7 +377,7 @@ * time. Make sure the @p transit object is still alive with * elm_transit_del_cb_set() function. * All added effects will be deleted, calling its repective data_free_cb - * functions. The function setted by elm_tansit_del_cb_set() will be called. + * functions. The function setted by elm_transit_del_cb_set() will be called. * * @see elm_transit_del_cb_set() * |
From: Enlightenment S. <no-...@en...> - 2011-04-12 11:31:09
|
Log: elementary / transit - fixed a incorrect logic prevent user from calling elm_transit_del in the user del cb. Author: hermet Date: 2011-04-12 04:31:03 -0700 (Tue, 12 Apr 2011) New Revision: 58591 Trac: http://trac.enlightenment.org/e/changeset/58591 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-12 11:10:00 UTC (rev 58590) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-12 11:31:03 UTC (rev 58591) @@ -225,6 +225,8 @@ Elm_Transit_Effect_Module *effect_module; Elm_Transit *chain_transit; + transit->deleted = EINA_TRUE; + EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) { if (transit->prev_chain_transit) |
From: Enlightenment S. <no-...@en...> - 2011-04-15 16:32:17
|
Log: elementary / transit - updated internal minors Author: hermet Date: 2011-04-15 09:32:08 -0700 (Fri, 15 Apr 2011) New Revision: 58690 Trac: http://trac.enlightenment.org/e/changeset/58690 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-15 13:33:44 UTC (rev 58689) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-15 16:32:08 UTC (rev 58690) @@ -37,10 +37,10 @@ * elm_transit_effect_add(transit, * elm_transit_effect_translation_op, effect_context, * elm_transit_effect_translation_context_free); - * elm_transit_duration_set(transit, 5); + * elm_transit_duration_set(transit, 1); * elm_transit_auto_reverse_set(transit, EINA_TRUE); * elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE); - * elm_transit_repeat_times_set(transit, -1); + * elm_transit_repeat_times_set(transit, 3); * @endcode * * @warning We strongly recomend to use elm_transit just when edje can not do @@ -50,7 +50,7 @@ static const char _transit_key[] = "_elm_transit"; -#define FOCAL 2000 +#define _TRANSIT_FOCAL 2000 struct _Elm_Transit { @@ -1340,7 +1340,7 @@ evas_object_geometry_get(obj, &x, &y, &w, &h); evas_map_util_points_populate_from_object_full(map, obj, zoom->from + (progress * zoom->to)); - evas_map_util_3d_perspective(map, x + (w / 2), y + (h / 2), 0, FOCAL); + evas_map_util_3d_perspective(map, x + (w / 2), y + (h / 2), 0, _TRANSIT_FOCAL); evas_object_map_set(obj, map); evas_object_map_enable_set(obj, EINA_TRUE); } @@ -1355,8 +1355,8 @@ zoom = ELM_NEW(Elm_Transit_Effect_Zoom); if (!zoom) return NULL; - zoom->from = (FOCAL - (from_rate * FOCAL)) * (1 / from_rate); - zoom->to = ((FOCAL - (to_rate * FOCAL)) * (1 / to_rate)) - zoom->from; + zoom->from = (_TRANSIT_FOCAL - (from_rate * _TRANSIT_FOCAL)) * (1 / from_rate); + zoom->to = ((_TRANSIT_FOCAL - (to_rate * _TRANSIT_FOCAL)) * (1 / to_rate)) - zoom->from; return zoom; } @@ -1499,7 +1499,7 @@ evas_map_util_3d_rotate(map, degree, 0, 0, x + half_w, y + half_h, 0); } - evas_map_util_3d_perspective(map, x + half_w, y + half_h, 0, FOCAL); + evas_map_util_3d_perspective(map, x + half_w, y + half_h, 0, _TRANSIT_FOCAL); evas_object_map_enable_set(front, EINA_TRUE); evas_object_map_enable_set(back, EINA_TRUE); evas_object_map_set(obj, map); @@ -1800,7 +1800,7 @@ 0, x + half_w, y + half_h, 0); } - evas_map_util_3d_perspective(map, x + half_w, y + half_h, 0, FOCAL); + evas_map_util_3d_perspective(map, x + half_w, y + half_h, 0, _TRANSIT_FOCAL); evas_object_map_enable_set(resizable_flip_node->front, EINA_TRUE); evas_object_map_enable_set(resizable_flip_node->back, EINA_TRUE); evas_object_map_set(obj, map); @@ -1927,7 +1927,7 @@ default: break; } - evas_map_util_3d_perspective(map, x + (w / 2), y + (h / 2), 0, FOCAL); + evas_map_util_3d_perspective(map, x + (w / 2), y + (h / 2), 0, _TRANSIT_FOCAL); } static void @@ -1988,7 +1988,7 @@ default: break; } - evas_map_util_3d_perspective(map, x + (w / 2), y + (h / 2), 0, FOCAL); + evas_map_util_3d_perspective(map, x + (w / 2), y + (h / 2), 0, _TRANSIT_FOCAL); } static void @@ -2621,7 +2621,7 @@ half_h = (float)h * 0.5; evas_map_util_3d_rotate(map, 0, 0, degree, x + half_w, y + half_h, 0); - evas_map_util_3d_perspective(map, x + half_w, y + half_h, 0, FOCAL); + evas_map_util_3d_perspective(map, x + half_w, y + half_h, 0, _TRANSIT_FOCAL); evas_object_map_enable_set(obj, EINA_TRUE); evas_object_map_set(obj, map); } |
From: Enlightenment S. <no-...@en...> - 2011-04-15 17:00:43
|
Log: elementary / transit - modified minor logic error Author: hermet Date: 2011-04-15 10:00:37 -0700 (Fri, 15 Apr 2011) New Revision: 58691 Trac: http://trac.enlightenment.org/e/changeset/58691 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-04-15 16:32:08 UTC (rev 58690) +++ trunk/elementary/src/lib/elm_transit.c 2011-04-15 17:00:37 UTC (rev 58691) @@ -225,8 +225,6 @@ Elm_Transit_Effect_Module *effect_module; Elm_Transit *chain_transit; - transit->deleted = EINA_TRUE; - EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) { if (transit->prev_chain_transit) @@ -245,6 +243,8 @@ while (transit->objs) _elm_transit_object_remove(transit, eina_list_data_get(transit->objs)); + transit->deleted = EINA_TRUE; + if (transit->del_data.func) transit->del_data.func(transit->del_data.arg, transit); |
From: Enlightenment S. <no-...@en...> - 2011-04-15 17:01:47
|
Log: elementary / actionslider, calendar, colorselector, bubble, hoversel, clock - updated them for using common signal callback table. Author: hermet Date: 2011-04-15 10:01:39 -0700 (Fri, 15 Apr 2011) New Revision: 58692 Trac: http://trac.enlightenment.org/e/changeset/58692 Modified: 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_calendar.c trunk/elementary/src/lib/elm_clock.c trunk/elementary/src/lib/elm_colorselector.c Modified: trunk/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/elementary/src/lib/elc_hoversel.c 2011-04-15 17:00:37 UTC (rev 58691) +++ trunk/elementary/src/lib/elc_hoversel.c 2011-04-15 17:01:39 UTC (rev 58692) @@ -14,7 +14,6 @@ * * "clicked" - the user clicked the hoversel button and popped up the sel * "selected" - an item in the hoversel list is selected. event_info is the item - * "selected" - Elm_Hoversel_Item * "dismissed" - the hover is dismissed */ typedef struct _Widget_Data Widget_Data; @@ -48,6 +47,17 @@ static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _parent_del(void *data, Evas *e, Evas_Object *obj, void *event_info); +static const char SIG_CLICKED[] = "clicked"; +static const char SIG_SELECTED[] = "selected"; +static const char SIG_DISMISSED[] = "dismissed"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {SIG_SELECTED, ""}, + {SIG_DISMISSED, ""}, + {NULL, NULL} +}; + static void _del_pre_hook(Evas_Object *obj) { @@ -150,7 +160,7 @@ elm_hoversel_hover_end(obj2); if (item->func) item->func((void *)item->base.data, obj2, item); - evas_object_smart_callback_call(obj2, "selected", item); + evas_object_smart_callback_call(obj2, SIG_SELECTED, item); } static void @@ -232,7 +242,7 @@ evas_object_show(bx); evas_object_show(wd->hover); - evas_object_smart_callback_call(obj, "clicked", NULL); + evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); // if (wd->horizontal) evas_object_hide(wd->btn); } @@ -293,10 +303,13 @@ evas_object_event_callback_add(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); evas_object_smart_callback_add(wd->btn, "clicked", _button_clicked, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + elm_widget_sub_object_add(obj, wd->btn); elm_hoversel_hover_parent_set(obj, parent); _theme_hook(obj); + return obj; } @@ -517,7 +530,7 @@ wd->expanded = EINA_FALSE; evas_object_del(wd->hover); wd->hover = NULL; - evas_object_smart_callback_call(obj, "dismissed", NULL); + evas_object_smart_callback_call(obj, SIG_DISMISSED, NULL); } /** Modified: trunk/elementary/src/lib/elm_actionslider.c =================================================================== --- trunk/elementary/src/lib/elm_actionslider.c 2011-04-15 17:00:37 UTC (rev 58691) +++ trunk/elementary/src/lib/elm_actionslider.c 2011-04-15 17:01:39 UTC (rev 58692) @@ -33,8 +33,8 @@ static const char *widtype = NULL; -#define SIG_CHANGED "pos_changed" -#define SIG_SELECTED "selected" +static const char SIG_CHANGED[] = "pos_changed"; +static const char SIG_SELECTED[] = "selected"; static const Evas_Smart_Cb_Description _signals[] = { Modified: trunk/elementary/src/lib/elm_bubble.c =================================================================== --- trunk/elementary/src/lib/elm_bubble.c 2011-04-15 17:00:37 UTC (rev 58691) +++ trunk/elementary/src/lib/elm_bubble.c 2011-04-15 17:01:39 UTC (rev 58692) @@ -29,7 +29,8 @@ static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _sub_del(void *data, Evas_Object *obj, void *event_info); -#define SIG_CLICKED "clicked" +static const char SIG_CLICKED[] = "clicked"; + static const Evas_Smart_Cb_Description _signals[] = { {SIG_CLICKED, ""}, Modified: trunk/elementary/src/lib/elm_calendar.c =================================================================== --- trunk/elementary/src/lib/elm_calendar.c 2011-04-15 17:00:37 UTC (rev 58691) +++ trunk/elementary/src/lib/elm_calendar.c 2011-04-15 17:01:39 UTC (rev 58692) @@ -62,6 +62,14 @@ static void _on_focus_hook(void *data, Evas_Object *obj); static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); +static const char SIG_CHANGED[] = "changed"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CHANGED, ""}, + {NULL, NULL} +}; + + /* Should not be translated, it's used if we failed * getting from locale. */ static const char *_days_abbrev[] = @@ -536,7 +544,7 @@ wd->selected_time.tm_mday = maxdays; _fix_selected_time(wd); - evas_object_smart_callback_call(obj, "changed", NULL); + evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); return EINA_TRUE; } @@ -618,7 +626,7 @@ wd->selected_time.tm_mday = day; _select(wd, wd->selected_it); _fix_selected_time(wd); - evas_object_smart_callback_call(obj, "changed", NULL); + evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); } static void @@ -766,6 +774,8 @@ edje_object_signal_callback_add(wd->calendar, "elm,action,selected", "*", _day_selected, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + for (i = 0; i < 7; i++) { /* FIXME: I'm not aware of a known max, so if it fails, Modified: trunk/elementary/src/lib/elm_clock.c =================================================================== --- trunk/elementary/src/lib/elm_clock.c 2011-04-15 17:00:37 UTC (rev 58691) +++ trunk/elementary/src/lib/elm_clock.c 2011-04-15 17:01:39 UTC (rev 58692) @@ -47,6 +47,14 @@ static Eina_Bool _signal_clock_val_down(void *data); static void _time_update(Evas_Object *obj); +static const char SIG_CHANGED[] = "changed"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CHANGED, ""}, + {NULL, NULL} +}; + + static void _del_hook(Evas_Object *obj) { @@ -223,7 +231,7 @@ wd->interval = wd->interval / 1.05; ecore_timer_interval_set(wd->spin, wd->interval); _time_update(data); - evas_object_smart_callback_call(data, "changed", NULL); + evas_object_smart_callback_call(data, SIG_CHANGED, NULL); return ECORE_CALLBACK_RENEW; clock_val_up_cancel: wd->spin = NULL; @@ -276,7 +284,7 @@ wd->interval = wd->interval / 1.05; ecore_timer_interval_set(wd->spin, wd->interval); _time_update(data); - evas_object_smart_callback_call(data, "changed", NULL); + evas_object_smart_callback_call(data, SIG_CHANGED, NULL); return ECORE_CALLBACK_RENEW; clock_val_down_cancel: wd->spin = NULL; @@ -561,6 +569,8 @@ _time_update(obj); _ticker(obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + return obj; } Modified: trunk/elementary/src/lib/elm_colorselector.c =================================================================== --- trunk/elementary/src/lib/elm_colorselector.c 2011-04-15 17:00:37 UTC (rev 58691) +++ trunk/elementary/src/lib/elm_colorselector.c 2011-04-15 17:01:39 UTC (rev 58692) @@ -84,7 +84,7 @@ static void _add_colorbar(Evas_Object *obj); static void _set_color(Evas_Object *obj, int r, int g, int b, int a); -#define SIG_CHANGED "changed" +static const char SIG_CHANGED[] = "changed"; static const Evas_Smart_Cb_Description _signals[] = { |
From: Enlightenment S. <no-...@en...> - 2011-04-15 17:05:42
|
Log: elementary/image, icon - updated signal callback table Author: hermet Date: 2011-04-15 10:05:34 -0700 (Fri, 15 Apr 2011) New Revision: 58693 Trac: http://trac.enlightenment.org/e/changeset/58693 Modified: trunk/elementary/src/lib/elm_icon.c trunk/elementary/src/lib/elm_image.c Modified: trunk/elementary/src/lib/elm_icon.c =================================================================== --- trunk/elementary/src/lib/elm_icon.c 2011-04-15 17:01:39 UTC (rev 58692) +++ trunk/elementary/src/lib/elm_icon.c 2011-04-15 17:05:34 UTC (rev 58693) @@ -48,6 +48,14 @@ static Eina_Bool _icon_standard_set(Widget_Data *wd, Evas_Object *obj, const char *name); static Eina_Bool _icon_freedesktop_set(Widget_Data *wd, Evas_Object *obj, const char *name, int size); +static const char SIG_CLICKED[] = "clicked"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {NULL, NULL} +}; + + //FIXME: move this code to ecore #ifdef _WIN32 static Eina_Bool @@ -168,7 +176,7 @@ { Evas_Event_Mouse_Up *ev = event_info; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; - evas_object_smart_callback_call(data, "clicked", event_info); + evas_object_smart_callback_call(data, SIG_CLICKED, event_info); } /** Modified: trunk/elementary/src/lib/elm_image.c =================================================================== --- trunk/elementary/src/lib/elm_image.c 2011-04-15 17:01:39 UTC (rev 58692) +++ trunk/elementary/src/lib/elm_image.c 2011-04-15 17:05:34 UTC (rev 58693) @@ -12,7 +12,6 @@ * Signals that you can add callbacks for are: * * "clicked" - This is called when a user has clicked the image - * "drop" - Something has been dropped on the image */ typedef struct _Widget_Data Widget_Data; @@ -33,6 +32,14 @@ static void _sizing_eval(Evas_Object *obj); static void _mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); +static const char SIG_CLICKED[] = "clicked"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {NULL, NULL} +}; + + static void _del_hook(Evas_Object *obj) { @@ -96,7 +103,7 @@ static void _mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - evas_object_smart_callback_call(data, "clicked", NULL); + evas_object_smart_callback_call(data, SIG_CLICKED, NULL); } /** |
From: Enlightenment S. <no-...@en...> - 2011-04-15 17:08:11
|
Log: elementary / image, icon - added missing lines about signal callback table. Author: hermet Date: 2011-04-15 10:08:04 -0700 (Fri, 15 Apr 2011) New Revision: 58694 Trac: http://trac.enlightenment.org/e/changeset/58694 Modified: trunk/elementary/src/lib/elm_icon.c trunk/elementary/src/lib/elm_image.c Modified: trunk/elementary/src/lib/elm_icon.c =================================================================== --- trunk/elementary/src/lib/elm_icon.c 2011-04-15 17:05:34 UTC (rev 58693) +++ trunk/elementary/src/lib/elm_icon.c 2011-04-15 17:08:04 UTC (rev 58694) @@ -214,6 +214,8 @@ evas_object_repeat_events_set(wd->img, EINA_TRUE); elm_widget_resize_object_set(obj, wd->img); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + wd->smooth = EINA_TRUE; wd->scale_up = EINA_TRUE; wd->scale_down = EINA_TRUE; Modified: trunk/elementary/src/lib/elm_image.c =================================================================== --- trunk/elementary/src/lib/elm_image.c 2011-04-15 17:05:34 UTC (rev 58693) +++ trunk/elementary/src/lib/elm_image.c 2011-04-15 17:08:04 UTC (rev 58694) @@ -138,6 +138,8 @@ evas_object_repeat_events_set(wd->img, EINA_TRUE); elm_widget_resize_object_set(obj, wd->img); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + wd->smooth = EINA_TRUE; wd->scale_up = EINA_TRUE; wd->scale_down = EINA_TRUE; |
From: Enlightenment S. <no-...@en...> - 2011-04-21 15:57:11
|
Log: elementary / menu, list, index, pager - modified to use signal callback table. Author: hermet Date: 2011-04-21 08:57:03 -0700 (Thu, 21 Apr 2011) New Revision: 58807 Trac: http://trac.enlightenment.org/e/changeset/58807 Modified: trunk/elementary/src/lib/elm_index.c trunk/elementary/src/lib/elm_list.c trunk/elementary/src/lib/elm_menu.c trunk/elementary/src/lib/elm_pager.c Modified: trunk/elementary/src/lib/elm_index.c =================================================================== --- trunk/elementary/src/lib/elm_index.c 2011-04-21 15:34:44 UTC (rev 58806) +++ trunk/elementary/src/lib/elm_index.c 2011-04-21 15:57:03 UTC (rev 58807) @@ -51,6 +51,21 @@ static void _index_box_clear(Evas_Object *obj, Evas_Object *box, int level); static void _item_free(Elm_Index_Item *it); +static const char SIG_CHANGED[] = "changed"; +static const char SIG_DELAY_CHANGED[] = "delay,changed"; +static const char SIG_SELECTED[] = "selected"; +static const char SIG_LEVEL_UP[] = "level,up"; +static const char SIG_LEVEL_DOWN[] = "level,down"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CHANGED, ""}, + {SIG_DELAY_CHANGED, ""}, + {SIG_SELECTED, ""}, + {SIG_LEVEL_UP, ""}, + {SIG_LEVEL_DOWN, ""}, + {NULL, NULL} +}; + static void _del_pre_hook(Evas_Object *obj) { @@ -303,7 +318,7 @@ if (!wd) return ECORE_CALLBACK_CANCEL; wd->delay = NULL; d = (void *)elm_index_item_selected_get(data, wd->level); - if (d) evas_object_smart_callback_call(data, "delay,changed", d); + if (d) evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, d); return ECORE_CALLBACK_CANCEL; } @@ -387,7 +402,7 @@ selectraise = edje_object_data_get(it->base.view, "selectraise"); if ((selectraise) && (!strcmp(selectraise, "on"))) evas_object_raise(it->base.view); - evas_object_smart_callback_call((void *)obj, "changed", (void *)it->base.data); + evas_object_smart_callback_call((void *)obj, SIG_CHANGED, (void *)it->base.data); if (wd->delay) ecore_timer_del(wd->delay); wd->delay = ecore_timer_add(0.2, _delay_change, obj); } @@ -456,7 +471,7 @@ if (ev->button != 1) return; wd->down = 0; d = (void *)elm_index_item_selected_get(data, wd->level); - if (d) evas_object_smart_callback_call(data, "selected", d); + if (d) evas_object_smart_callback_call(data, SIG_SELECTED, d); elm_index_active_set(data, 0); edje_object_signal_emit(wd->base, "elm,state,level,0", "elm"); } @@ -488,7 +503,7 @@ wd->level = 1; snprintf(buf, sizeof(buf), "elm,state,level,%i", wd->level); edje_object_signal_emit(wd->base, buf, "elm"); - evas_object_smart_callback_call(data, "level,up", NULL); + evas_object_smart_callback_call(data, SIG_LEVEL_UP, NULL); } } else @@ -498,7 +513,7 @@ wd->level = 0; snprintf(buf, sizeof(buf), "elm,state,level,%i", wd->level); edje_object_signal_emit(wd->base, buf, "elm"); - evas_object_smart_callback_call(data, "level,down", NULL); + evas_object_smart_callback_call(data, SIG_LEVEL_DOWN, NULL); } } } @@ -580,6 +595,8 @@ evas_object_show(wd->bx[1]); } + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); return obj; Modified: trunk/elementary/src/lib/elm_list.c =================================================================== --- trunk/elementary/src/lib/elm_list.c 2011-04-21 15:34:44 UTC (rev 58806) +++ trunk/elementary/src/lib/elm_list.c 2011-04-21 15:57:03 UTC (rev 58807) @@ -95,6 +95,27 @@ Evas_Callback_Type type, void *event_info); static Eina_Bool _deselect_all_items(Widget_Data *wd); +static const char SIG_CLICKED_DOUBLE[] = "clicked,double"; +static const char SIG_SELECTED[] = "selected"; +static const char SIG_UNSELECTED[] = "unselected"; +static const char SIG_LONGPRESSED[] = "longpressed"; +static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; +static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; +static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; +static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED_DOUBLE, ""}, + {SIG_SELECTED, ""}, + {SIG_UNSELECTED, ""}, + {SIG_LONGPRESSED, ""}, + {SIG_SCROLL_EDGE_TOP, ""}, + {SIG_SCROLL_EDGE_BOTTOM, ""}, + {SIG_SCROLL_EDGE_LEFT, ""}, + {SIG_SCROLL_EDGE_RIGHT, ""}, + {NULL, NULL} +}; + #define ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, ...) \ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); \ if (it->deleted) \ @@ -103,6 +124,8 @@ return __VA_ARGS__; \ } + + static inline void _elm_list_item_free(Elm_List_Item *it) { @@ -707,7 +730,7 @@ _elm_list_walk(wd); if (it->func) it->func((void *)it->base.data, it->base.widget, it); - evas_object_smart_callback_call(obj, "selected", it); + evas_object_smart_callback_call(obj, SIG_SELECTED, it); it->wd->last_selected_item = it; _elm_list_unwalk(wd); @@ -741,7 +764,7 @@ { it->selected = EINA_FALSE; wd->selected = eina_list_remove(wd->selected, it); - evas_object_smart_callback_call(it->base.widget, "unselected", it); + evas_object_smart_callback_call(it->base.widget, SIG_UNSELECTED, it); } _elm_list_unwalk(wd); @@ -808,28 +831,28 @@ _scroll_edge_left(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; - evas_object_smart_callback_call(obj, "scroll,edge,left", NULL); + evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_LEFT, NULL); } static void _scroll_edge_right(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; - evas_object_smart_callback_call(obj, "scroll,edge,right", NULL); + evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_RIGHT, NULL); } static void _scroll_edge_top(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; - evas_object_smart_callback_call(obj, "scroll,edge,top", NULL); + evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_TOP, NULL); } static void _scroll_edge_bottom(void *data, Evas_Object *scr __UNUSED__, void *event_info __UNUSED__) { Evas_Object *obj = data; - evas_object_smart_callback_call(obj, "scroll,edge,bottom", NULL); + evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_BOTTOM, NULL); } static Eina_Bool @@ -846,7 +869,7 @@ if (it->disabled) goto end; wd->longpressed = EINA_TRUE; - evas_object_smart_callback_call(it->base.widget, "longpressed", it); + evas_object_smart_callback_call(it->base.widget, SIG_LONGPRESSED, it); end: return ECORE_CALLBACK_CANCEL; @@ -900,7 +923,7 @@ /* Always call the callbacks last - the user may delete our context! */ if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) { - evas_object_smart_callback_call(it->base.widget, "clicked,double", it); + evas_object_smart_callback_call(it->base.widget, SIG_CLICKED_DOUBLE, it); evas_object_smart_callback_call(it->base.widget, "clicked", it); // will be removed } wd->swipe = EINA_FALSE; @@ -1341,6 +1364,8 @@ evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, obj); evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); return obj; Modified: trunk/elementary/src/lib/elm_menu.c =================================================================== --- trunk/elementary/src/lib/elm_menu.c 2011-04-21 15:34:44 UTC (rev 58806) +++ trunk/elementary/src/lib/elm_menu.c 2011-04-21 15:57:03 UTC (rev 58807) @@ -55,6 +55,14 @@ static void _parent_del(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _menu_hide(void *data, Evas_Object *obj, void *event_info); +static const char SIG_CLICKED[] = "clicked"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {NULL, NULL} +}; + + static void _del_item(Elm_Menu_Item *item) { @@ -273,7 +281,7 @@ _hover_clicked_cb(void *data, Evas_Object *obj, void *event_info) { _menu_hide(data, obj, event_info); - evas_object_smart_callback_call(data, "clicked", NULL); + evas_object_smart_callback_call(data, SIG_CLICKED, NULL); } static void @@ -483,6 +491,8 @@ evas_object_event_callback_add(wd->bx, EVAS_CALLBACK_RESIZE, _menu_resize, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _sizing_eval(obj); return obj; } Modified: trunk/elementary/src/lib/elm_pager.c =================================================================== --- trunk/elementary/src/lib/elm_pager.c 2011-04-21 15:34:44 UTC (rev 58806) +++ trunk/elementary/src/lib/elm_pager.c 2011-04-21 15:57:03 UTC (rev 58807) @@ -50,6 +50,14 @@ static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _sub_del(void *data, Evas_Object *obj, void *event_info); +static const char SIG_HIDE_FINISHED[] = "hide,finished"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_HIDE_FINISHED, ""}, + {NULL, NULL} +}; + + static void _del_hook(Evas_Object *obj) { @@ -239,7 +247,7 @@ Evas_Object *obj2 = it->obj; evas_object_hide(it->base); edje_object_signal_emit(it->base, "elm,action,reset", "elm"); - evas_object_smart_callback_call(obj2, "hide,finished", it->content); + evas_object_smart_callback_call(obj2, SIG_HIDE_FINISHED, it->content); edje_object_message_signal_process(it->base); evas_object_hide(it->content); if (it->popme) evas_object_del(it->content); @@ -286,6 +294,8 @@ evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); return obj; |
From: Enlightenment S. <no-...@en...> - 2011-04-22 00:42:40
|
Log: elementary/segment_control, panes, photocam, photo, win, toolbar, thumb, slideshow, spinner - updated signal callbacks. made them use signal callbacks description table. removed never-called signals updated doxygen. Author: hermet Date: 2011-04-21 17:42:32 -0700 (Thu, 21 Apr 2011) New Revision: 58816 Trac: http://trac.enlightenment.org/e/changeset/58816 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_panes.c trunk/elementary/src/lib/elm_photo.c trunk/elementary/src/lib/elm_photocam.c trunk/elementary/src/lib/elm_segment_control.c trunk/elementary/src/lib/elm_slideshow.c trunk/elementary/src/lib/elm_spinner.c trunk/elementary/src/lib/elm_thumb.c trunk/elementary/src/lib/elm_toolbar.c trunk/elementary/src/lib/elm_win.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/Elementary.h.in 2011-04-22 00:42:32 UTC (rev 58816) @@ -1388,7 +1388,6 @@ EAPI void elm_photo_editable_set(Evas_Object *obj, Eina_Bool set) EINA_ARG_NONNULL(1); /* smart callbacks called: * "clicked" - the user clicked the icon - * "drop" - Something was dropped on the widget * "drag,start" - Someone started dragging the image out of the object * "drag,end" - Dragged item was dropped (somewhere) */ @@ -2157,8 +2156,8 @@ * "clicked,double" - when mouse/finger double-clicked * "load" - when photo load begins * "loaded" - when photo load done - * "load,details" - when detailed image load begins - * "loaded,details" - when detailed image load done + * "load,detail" - when detailed image load begins + * "loaded,detail" - when detailed image load done * "zoom,start" - when zooming started * "zoom,stop" - when zooming stopped * "zoom,change" - when auto zoom mode changed zoom level @@ -2879,6 +2878,11 @@ EAPI Evas_Object *elm_segment_control_item_object_get(const Elm_Segment_Item *it) EINA_ARG_NONNULL(1); EAPI Elm_Segment_Item *elm_segment_control_item_selected_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select) EINA_ARG_NONNULL(1); + /* smart callbacks called: + * "changed" -when the user clicks on a segment item which is not previously + * selected and get selected. The event_info parameter is the + * segment item index. + */ #ifdef __cplusplus } Modified: trunk/elementary/src/lib/elm_panes.c =================================================================== --- trunk/elementary/src/lib/elm_panes.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_panes.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -36,6 +36,19 @@ static void _sizing_eval(Evas_Object *obj); static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); +static const char SIG_CLICKED[] = "clicked"; +static const char SIG_PRESS[] = "press"; +static const char SIG_UNPRESS[] = "unpress"; +static const char SIG_CLICKED_DOUBLE[] = "clicked,double"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {SIG_PRESS, ""}, + {SIG_UNPRESS, ""}, + {SIG_CLICKED_DOUBLE, ""}, + {NULL, NULL} +}; + static void _del_hook(Evas_Object *obj) { @@ -162,10 +175,11 @@ } } + static void _clicked(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__) { - evas_object_smart_callback_call(data, "clicked", NULL); + evas_object_smart_callback_call(data, SIG_CLICKED, NULL); } static void @@ -179,18 +193,18 @@ static void _press(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__) { - evas_object_smart_callback_call(data, "press", NULL); + evas_object_smart_callback_call(data, SIG_PRESS, NULL); } static void _unpress(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); - evas_object_smart_callback_call(data, "unpress", NULL); + evas_object_smart_callback_call(data, SIG_UNPRESS, NULL); if (wd->clicked_double) { - evas_object_smart_callback_call(data, "clicked,double", NULL); + evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, NULL); wd->clicked_double = EINA_FALSE; } } @@ -241,6 +255,8 @@ evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); return obj; Modified: trunk/elementary/src/lib/elm_photo.c =================================================================== --- trunk/elementary/src/lib/elm_photo.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_photo.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -10,7 +10,6 @@ * Signals that you can add callbacks for are: * * "clicked" - This is called when a user has clicked the photo - * "drop" - Something was dropped on the widget * "drag,start" - Someone started dragging the image out of the object * "drag,end" - Dragged item was dropped (somewhere) */ @@ -34,6 +33,18 @@ static void _mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info); +static const char SIG_CLICKED[] = "clicked"; +static const char SIG_DRAG_START[] = "drag,start"; +static const char SIG_DRAG_END[] = "drag,end"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {SIG_DRAG_START, ""}, + {SIG_DRAG_END, ""}, + {NULL, NULL} +}; + + static void _del_hook(Evas_Object *obj) { @@ -116,7 +127,7 @@ _drag_done_cb(void *unused __UNUSED__, Evas_Object *obj) { elm_object_scroll_freeze_pop(obj); - evas_object_smart_callback_call(obj, "drag,end", NULL); + evas_object_smart_callback_call(obj, SIG_DRAG_END, NULL); } static Eina_Bool @@ -144,7 +155,7 @@ } elm_object_scroll_freeze_push(objv); - evas_object_smart_callback_call(objv, "drag,start", NULL); + evas_object_smart_callback_call(objv, SIG_DRAG_START, NULL); return 0; /* Don't call again */ } @@ -197,7 +208,7 @@ wd->longtimer = NULL; } - evas_object_smart_callback_call(data, "clicked", NULL); + evas_object_smart_callback_call(data, SIG_CLICKED, NULL); } @@ -257,6 +268,8 @@ evas_object_event_callback_add(icon, EVAS_CALLBACK_RESIZE, _icon_move_resize, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); return obj; Modified: trunk/elementary/src/lib/elm_photocam.c =================================================================== --- trunk/elementary/src/lib/elm_photocam.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_photocam.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -21,8 +21,8 @@ * "load" - Photo load begins. * "loaded" - This is called when the image file load is complete for the first * view (low resolution blurry version). - * "load,details" - Photo detailed data load begins. - * "loaded,details" - This is called when the image file load is complete for + * "load,detail" - Photo detailed data load begins. + * "loaded,detail" - This is called when the image file load is complete for * the detailed image data (full resolution needed). * "zoom,start" - Zoom animation started. * "zoom,stop" - Zoom animation stopped. @@ -135,6 +135,44 @@ static Grid *grid_create(Evas_Object *obj); static void grid_load(Evas_Object *obj, Grid *g); +static const char SIG_CLICKED[] = "clicked"; +static const char SIG_PRESS[] = "press"; +static const char SIG_LONGPRESSED[] = "longpressed"; +static const char SIG_CLICKED_DOUBLE[] = "clicked,double"; +static const char SIG_LOAD[] = "load"; +static const char SIG_LOADED[] = "loaded"; +static const char SIG_LOAD_DETAIL[] = "load,detail"; +static const char SIG_LOADED_DETAIL[] = "loaded,detail"; +static const char SIG_ZOOM_START[] = "zoom,start"; +static const char SIG_ZOOM_STOP[] = "zoom,stop"; +static const char SIG_ZOOM_CHANGE[] = "zoom,change"; +static const char SIG_SCROLL[] = "scroll"; +static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start"; +static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop"; +static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start"; +static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {SIG_PRESS, ""}, + {SIG_LONGPRESSED, ""}, + {SIG_CLICKED_DOUBLE, ""}, + {SIG_LOAD, ""}, + {SIG_LOADED, ""}, + {SIG_LOAD_DETAIL, ""}, + {SIG_LOADED_DETAIL, ""}, + {SIG_ZOOM_START, ""}, + {SIG_ZOOM_STOP, ""}, + {SIG_ZOOM_CHANGE, ""}, + {SIG_SCROLL, ""}, + {SIG_SCROLL_ANIM_START, ""}, + {SIG_SCROLL_ANIM_STOP, ""}, + {SIG_SCROLL_DRAG_START, ""}, + {SIG_SCROLL_DRAG_STOP, ""}, + {NULL, NULL} +}; + + static int nearest_pow2(int num) { @@ -235,7 +273,7 @@ { edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,state,busy,stop", "elm"); - evas_object_smart_callback_call(obj, "loaded,detail", NULL); + evas_object_smart_callback_call(obj, SIG_LOAD_DETAIL, NULL); } } } @@ -261,7 +299,7 @@ { edje_object_signal_emit(elm_smart_scroller_edje_object_get(git->wd->scr), "elm,state,busy,stop", "elm"); - evas_object_smart_callback_call(git->wd->obj, "loaded,detail", NULL); + evas_object_smart_callback_call(git->wd->obj, SIG_LOADED_DETAIL, NULL); } } } @@ -401,7 +439,7 @@ { edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,state,busy,start", "elm"); - evas_object_smart_callback_call(obj, "load,detail", NULL); + evas_object_smart_callback_call(obj, SIG_LOAD_DETAIL, NULL); } } else if ((g->grid[tn].want) && (!visible)) @@ -411,7 +449,7 @@ { edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,state,busy,stop", "elm"); - evas_object_smart_callback_call(obj, "loaded,detail", NULL); + evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL, NULL); } g->grid[tn].want = 0; evas_object_hide(g->grid[tn].img); @@ -525,13 +563,13 @@ } if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - evas_object_smart_callback_call(data, "loaded", NULL); + evas_object_smart_callback_call(data, SIG_LOADED, NULL); wd->preload_num--; if (!wd->preload_num) { edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,state,busy,stop", "elm"); - evas_object_smart_callback_call(obj, "loaded,detail", NULL); + evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL, NULL); } } @@ -602,7 +640,7 @@ wd->nosmooth--; if (!wd->nosmooth) _smooth_update(data); wd->zoom_animator = NULL; - evas_object_smart_callback_call(obj, "zoom,stop", NULL); + evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); } return go; } @@ -622,7 +660,7 @@ if (!wd) return ECORE_CALLBACK_CANCEL; wd->long_timer = NULL; wd->longpressed = EINA_TRUE; - evas_object_smart_callback_call(data, "longpressed", NULL); + evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL); return ECORE_CALLBACK_CANCEL; } @@ -636,9 +674,9 @@ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE; else wd->on_hold = EINA_FALSE; if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) - evas_object_smart_callback_call(data, "clicked,double", NULL); + evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, NULL); else - evas_object_smart_callback_call(data, "press", NULL); + evas_object_smart_callback_call(data, SIG_PRESS, NULL); wd->longpressed = EINA_FALSE; if (wd->long_timer) ecore_timer_del(wd->long_timer); wd->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data); @@ -659,7 +697,7 @@ wd->long_timer = NULL; } if (!wd->on_hold) - evas_object_smart_callback_call(data, "clicked", NULL); + evas_object_smart_callback_call(data, SIG_CLICKED, NULL); wd->on_hold = EINA_FALSE; } @@ -917,31 +955,31 @@ static void _scr_anim_start(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - evas_object_smart_callback_call(data, "scroll,anim,start", NULL); + evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_START, NULL); } static void _scr_anim_stop(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - evas_object_smart_callback_call(data, "scroll,anim,stop", NULL); + evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, NULL); } static void _scr_drag_start(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - evas_object_smart_callback_call(data, "scroll,drag,start", NULL); + evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_START, NULL); } static void _scr_drag_stop(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - evas_object_smart_callback_call(data, "scroll,drag,stop", NULL); + evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_STOP, NULL); } static void _scr_scroll(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - evas_object_smart_callback_call(data, "scroll", NULL); + evas_object_smart_callback_call(data, SIG_SCROLL, NULL); } static Eina_Bool @@ -1131,6 +1169,8 @@ &minw, &minh); evas_object_size_hint_min_set(obj, minw, minh); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _sizing_eval(obj); return obj; } @@ -1185,13 +1225,13 @@ wd->main_load_pending = 1; if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - evas_object_smart_callback_call(obj, "load", NULL); + evas_object_smart_callback_call(obj, SIG_LOAD, NULL); wd->preload_num++; if (wd->preload_num == 1) { edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,state,busy,start", "elm"); - evas_object_smart_callback_call(obj, "load,detail", NULL); + evas_object_smart_callback_call(obj, SIG_LOAD_DETAIL, NULL); } { double tz = wd->zoom; @@ -1409,12 +1449,12 @@ if (!wd->paused) { if (started) - evas_object_smart_callback_call(obj, "zoom,start", NULL); + evas_object_smart_callback_call(obj, SIG_ZOOM_START, NULL); if (!an) - evas_object_smart_callback_call(obj, "zoom,stop", NULL); + evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); } if (zoom_changed) - evas_object_smart_callback_call(obj, "zoom,change", NULL); + evas_object_smart_callback_call(obj, SIG_ZOOM_CHANGE, NULL); } /** @@ -1607,7 +1647,7 @@ ecore_animator_del(wd->zoom_animator); wd->zoom_animator = NULL; zoom_do(obj, 1.0); - evas_object_smart_callback_call(obj, "zoom,stop", NULL); + evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); } elm_smart_scroller_child_region_show(wd->scr, rx, ry, rw, rh); } @@ -1648,7 +1688,7 @@ ecore_animator_del(wd->zoom_animator); wd->zoom_animator = NULL; zoom_do(obj, 1.0); - evas_object_smart_callback_call(obj, "zoom,stop", NULL); + evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); } elm_smart_scroller_region_bring_in(wd->scr, rx, ry, rw, rh); } @@ -1680,7 +1720,7 @@ ecore_animator_del(wd->zoom_animator); wd->zoom_animator = NULL; zoom_do(obj, 1.0); - evas_object_smart_callback_call(obj, "zoom,stop", NULL); + evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); } } } Modified: trunk/elementary/src/lib/elm_segment_control.c =================================================================== --- trunk/elementary/src/lib/elm_segment_control.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_segment_control.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -59,6 +59,13 @@ static Elm_Segment_Item* _item_new(Evas_Object *obj, Evas_Object *icon, const char *label); +static const char SIG_CHANGED[] = "changed"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CHANGED, ""}, + {NULL, NULL} +}; + static void _sizing_eval(Evas_Object *obj) { @@ -228,7 +235,7 @@ edje_object_signal_emit(it->base.view, "elm,state,segment,selected", "elm"); wd->selected_item = it; - evas_object_smart_callback_call(wd->obj, "changed", (void*) it->seg_index); + evas_object_smart_callback_call(wd->obj, SIG_CHANGED, (void*) it->seg_index); } static void @@ -520,6 +527,9 @@ _on_move_resize, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_move_resize, obj); + + evas_object_smart_callbacks_descriptions_set(obj, _signals); + return obj; } Modified: trunk/elementary/src/lib/elm_slideshow.c =================================================================== --- trunk/elementary/src/lib/elm_slideshow.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_slideshow.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -65,6 +65,15 @@ static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info); +static const char SIG_CHANGED[] = "changed"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CHANGED, ""}, + {NULL, NULL} +}; + + + static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info) { @@ -347,6 +356,8 @@ evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); return obj; @@ -416,7 +427,7 @@ edje_object_signal_emit(wd->slideshow, buf, "slideshow"); wd->previous = wd->current; wd->current = next; - evas_object_smart_callback_call(item->base.widget, "changed", wd->current); + evas_object_smart_callback_call(item->base.widget, SIG_CHANGED, wd->current); } /** @@ -457,7 +468,7 @@ wd->previous = wd->current; wd->current = next; - evas_object_smart_callback_call(obj, "changed", wd->current); + evas_object_smart_callback_call(obj, SIG_CHANGED, wd->current); } /** @@ -498,7 +509,7 @@ wd->previous = wd->current; wd->current = prev; - evas_object_smart_callback_call(obj, "changed", wd->current); + evas_object_smart_callback_call(obj, SIG_CHANGED, wd->current); } /** Modified: trunk/elementary/src/lib/elm_spinner.c =================================================================== --- trunk/elementary/src/lib/elm_spinner.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_spinner.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -57,6 +57,15 @@ static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); +static const char SIG_CHANGED[] = "changed"; +static const char SIG_DELAY_CHANGED[] = "delay,changed"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CHANGED, ""}, + {SIG_DELAY_CHANGED, ""}, + {NULL, NULL} +}; + static void _del_hook(Evas_Object *obj) { @@ -165,7 +174,7 @@ Widget_Data *wd = elm_widget_data_get(data); if (!wd) return ECORE_CALLBACK_CANCEL; wd->delay = NULL; - evas_object_smart_callback_call(data, "delay,changed", NULL); + evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL); return ECORE_CALLBACK_CANCEL; } @@ -264,7 +273,7 @@ if (new_val == wd->val) return EINA_FALSE; wd->val = new_val; - evas_object_smart_callback_call(obj, "changed", NULL); + evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); if (wd->delay) ecore_timer_del(wd->delay); wd->delay = ecore_timer_add(0.2, _delay_change, obj); @@ -510,7 +519,7 @@ Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; _apply_entry_value(data); - evas_object_smart_callback_call(data, "changed", NULL); + evas_object_smart_callback_call(data, SIG_CHANGED, NULL); if (wd->delay) ecore_timer_del(wd->delay); wd->delay = ecore_timer_add(0.2, _delay_change, data); } @@ -631,6 +640,8 @@ edje_object_signal_callback_add(wd->spinner, "elm,action,entry,toggle", "*", _toggle_entry, obj); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); _write_label(obj); _sizing_eval(obj); Modified: trunk/elementary/src/lib/elm_thumb.c =================================================================== --- trunk/elementary/src/lib/elm_thumb.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_thumb.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -46,13 +46,13 @@ static const char *widtype = NULL; -#define SIG_CLICKED "clicked" -#define SIG_CLICKED_DOUBLE "clicked,double" -#define SIG_GENERATE_ERROR "generate,error" -#define SIG_GENERATE_START "generate,start" -#define SIG_GENERATE_STOP "generate,stop" -#define SIG_LOAD_ERROR "load,error" -#define SIG_PRESS "press" +static const char SIG_CLICKED[] = "clicked"; +static const char SIG_CLICKED_DOUBLE[] = "clicked,double"; +static const char SIG_GENERATE_ERROR[] = "generate,error"; +static const char SIG_GENERATE_START[] = "generate,start"; +static const char SIG_GENERATE_STOP[] = "generate,stop"; +static const char SIG_LOAD_ERROR[] = "load,error"; +static const char SIG_PRESS[] = "press"; static const Evas_Smart_Cb_Description _signals[] = { Modified: trunk/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/elementary/src/lib/elm_toolbar.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_toolbar.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -81,6 +81,14 @@ static void _elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *signal); static void _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *signal); +static const char SIG_CLICKED[] = "clicked"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_CLICKED, ""}, + {NULL, NULL} +}; + + static Eina_Bool _item_icon_set(Evas_Object *icon_obj, const char *type, const char *icon) { @@ -166,7 +174,7 @@ _menu_move_resize(it, NULL, NULL, NULL); } if (it->func) it->func((void *)(it->base.data), it->base.widget, it); - evas_object_smart_callback_call(obj2, "clicked", it); + evas_object_smart_callback_call(obj2, SIG_CLICKED, it); } static void @@ -749,6 +757,8 @@ evas_object_event_callback_add(wd->bx, EVAS_CALLBACK_RESIZE, _resize, obj); elm_toolbar_icon_order_lookup_set(obj, ELM_ICON_LOOKUP_THEME_FDO); + evas_object_smart_callbacks_descriptions_set(obj, _signals); + _sizing_eval(obj); return obj; } Modified: trunk/elementary/src/lib/elm_win.c =================================================================== --- trunk/elementary/src/lib/elm_win.c 2011-04-22 00:30:01 UTC (rev 58815) +++ trunk/elementary/src/lib/elm_win.c 2011-04-22 00:42:32 UTC (rev 58816) @@ -81,6 +81,21 @@ static void _elm_win_focus_highlight_anim_end(void *data, Evas_Object *obj, const char *emission, const char *source); static void _elm_win_focus_highlight_reconfigure(Elm_Win *win); +static const char SIG_DELETE_REQUEST[] = "delete,request"; +static const char SIG_FOCUS_OUT[] = "focus,in"; +static const char SIG_FOCUS_IN[] = "focus,out"; +static const char SIG_MOVED[] = "moved"; + +static const Evas_Smart_Cb_Description _signals[] = { + {SIG_DELETE_REQUEST, ""}, + {SIG_FOCUS_OUT, ""}, + {SIG_FOCUS_IN, ""}, + {SIG_MOVED, ""}, + {NULL, NULL} +}; + + + Eina_List *_elm_win_list = NULL; int _elm_win_deferred_free = 0; @@ -97,7 +112,7 @@ ecore_evas_geometry_get(ee, &x, &y, NULL, NULL); win->screen.x = x; win->screen.y = y; - evas_object_smart_callback_call(win->win_obj, "moved", NULL); + evas_object_smart_callback_call(win->win_obj, SIG_MOVED, NULL); } static void @@ -123,8 +138,8 @@ win = elm_widget_data_get(obj); if (!win) return; /*NB: Why two different "focus signals" here ??? */ - evas_object_smart_callback_call(win->win_obj, "focus-in", NULL); // FIXME: remove me - evas_object_smart_callback_call(win->win_obj, "focus,in", NULL); + evas_object_smart_callback_call(win->win_obj, SIG_FOCUS_IN, NULL); // FIXME: remove me + evas_object_smart_callback_call(win->win_obj, SIG_FOCUS_IN, NULL); win->focus_highlight.cur.visible = EINA_TRUE; _elm_win_focus_highlight_reconfigure_job_start(win); if (win->frame_obj) @@ -145,8 +160,8 @@ if (!obj) return; win = elm_widget_data_get(obj); if (!win) return; - evas_object_smart_callback_call(win->win_obj, "focus-out", NULL); // FIXME: remove me - evas_object_smart_callback_call(win->win_obj, "focus,out", NULL); + evas_object_smart_callback_call(win->win_obj, SIG_FOCUS_OUT, NULL); // FIXME: remove me + evas_object_smart_callback_call(win->win_obj, SIG_FOCUS_OUT, NULL); win->focus_highlight.cur.visible = EINA_FALSE; _elm_win_focus_highlight_reconfigure_job_start(win); if (win->frame_obj) @@ -349,7 +364,7 @@ { win->screen.x = x; win->screen.y = y; - evas_object_smart_callback_call(win->win_obj, "moved", NULL); + evas_object_smart_callback_call(win->win_obj, SIG_MOVED, NULL); } } else @@ -388,7 +403,7 @@ evas_object_geometry_get(obj, &x, &y, NULL, NULL); win->screen.x = x; win->screen.y = y; - evas_object_smart_callback_call(win->win_obj, "moved", NULL); + evas_object_smart_callback_call(win->win_obj, SIG_MOVED, NULL); } if (win->frame_obj) { @@ -434,8 +449,8 @@ if (!win) return; int autodel = win->autodel; win->autodel_clear = &autodel; - evas_object_smart_callback_call(win->win_obj, "delete-request", NULL); // FIXME: remove me - evas_object_smart_callback_call(win->win_obj, "delete,request", NULL); + evas_object_smart_callback_call(win->win_obj, SIG_DELETE_REQUEST, NULL); // FIXME: remove me. + evas_object_smart_callback_call(win->win_obj, SIG_DELETE_REQUEST, NULL); // FIXME: if above callback deletes - then the below will be invalid if (autodel) evas_object_del(win->win_obj); else win->autodel_clear = NULL; @@ -1365,6 +1380,9 @@ EINA_TRUE); printf("Key F12 exclusive for dot tree generation. (%d)\n", ret); #endif + + evas_object_smart_callbacks_descriptions_set(win->win_obj, _signals); + return win->win_obj; } |