forked from enlightenment/efl
fix up namespace for many signal while keeping old versions for compat
This commit is contained in:
parent
48d42f9f87
commit
95fdc9cc88
|
@ -1137,13 +1137,13 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
CRITICAL("Failed to set layout!");
|
||||
|
||||
elm_layout_signal_callback_add
|
||||
(obj, "elm,action,hide,finished", "", _hide_finished_cb, obj);
|
||||
(obj, "elm,action,hide,finished", "*", _hide_finished_cb, obj);
|
||||
|
||||
//Background
|
||||
priv->bg = edje_object_add(evas_object_evas_get(obj));
|
||||
elm_widget_theme_object_set(obj, priv->bg, "ctxpopup", "bg", "default");
|
||||
edje_object_signal_callback_add
|
||||
(priv->bg, "elm,action,click", "", _bg_clicked_cb, obj);
|
||||
(priv->bg, "elm,action,click", "*", _bg_clicked_cb, obj);
|
||||
|
||||
evas_object_stack_below(priv->bg, obj);
|
||||
|
||||
|
|
|
@ -1183,13 +1183,13 @@ _item_new(Evas_Object *obj,
|
|||
_on_item_size_hints_changed, obj);
|
||||
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), "elm,action,show,finished", "", _on_item_show_finished, it);
|
||||
(VIEW(it), "elm,action,show,finished", "*", _on_item_show_finished, it);
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), "elm,action,pushed,finished", "", _on_item_push_finished, it);
|
||||
(VIEW(it), "elm,action,pushed,finished", "*", _on_item_push_finished, it);
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), "elm,action,popped,finished", "", _on_item_pop_finished, it);
|
||||
(VIEW(it), "elm,action,popped,finished", "*", _on_item_pop_finished, it);
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), "elm,action,title,clicked", "", _on_item_title_clicked, it);
|
||||
(VIEW(it), "elm,action,title,clicked", "*", _on_item_title_clicked, it);
|
||||
|
||||
_item_style_set(it, item_style);
|
||||
|
||||
|
|
|
@ -407,13 +407,13 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
evas_object_color_set(priv->drag_button_base, 0, 0, 0, 0);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm.drag_button,mouse,up", "",
|
||||
(wd->resize_obj, "elm.drag_button,mouse,up", "*",
|
||||
_drag_button_up_cb, obj);
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm.drag_button,mouse,down", "",
|
||||
(wd->resize_obj, "elm.drag_button,mouse,down", "*",
|
||||
_drag_button_down_cb, obj);
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm.drag_button,mouse,move", "",
|
||||
(wd->resize_obj, "elm.drag_button,mouse,move", "*",
|
||||
_drag_button_move_cb, obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
|
|
|
@ -292,13 +292,13 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,click", "",
|
||||
(wd->resize_obj, "elm,action,click", "*",
|
||||
_on_clicked_signal, obj);
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,press", "",
|
||||
(wd->resize_obj, "elm,action,press", "*",
|
||||
_on_pressed_signal, obj);
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,unpress", "",
|
||||
(wd->resize_obj, "elm,action,unpress", "*",
|
||||
_on_unpressed_signal, obj);
|
||||
|
||||
_elm_access_object_register(obj, wd->resize_obj);
|
||||
|
|
|
@ -294,13 +294,13 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,check,on", "",
|
||||
(wd->resize_obj, "elm,action,check,on", "*",
|
||||
_on_check_on, obj);
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,check,off", "",
|
||||
(wd->resize_obj, "elm,action,check,off", "*",
|
||||
_on_check_off, obj);
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,check,toggle", "",
|
||||
(wd->resize_obj, "elm,action,check,toggle", "*",
|
||||
_on_check_toggle, obj);
|
||||
|
||||
_elm_access_object_register(obj, wd->resize_obj);
|
||||
|
|
|
@ -406,16 +406,16 @@ _time_update(Evas_Object *obj)
|
|||
edje_object_signal_emit
|
||||
(sd->digit[i], "elm,state,edit,on", "elm");
|
||||
edje_object_signal_callback_add
|
||||
(sd->digit[i], "elm,action,up,start", "",
|
||||
(sd->digit[i], "elm,action,up,start", "*",
|
||||
_on_clock_val_up_start, obj);
|
||||
edje_object_signal_callback_add
|
||||
(sd->digit[i], "elm,action,up,stop", "",
|
||||
(sd->digit[i], "elm,action,up,stop", "*",
|
||||
_on_clock_val_change_stop, obj);
|
||||
edje_object_signal_callback_add
|
||||
(sd->digit[i], "elm,action,down,start", "",
|
||||
(sd->digit[i], "elm,action,down,start", "*",
|
||||
_on_clock_val_down_start, obj);
|
||||
edje_object_signal_callback_add
|
||||
(sd->digit[i], "elm,action,down,stop", "",
|
||||
(sd->digit[i], "elm,action,down,stop", "*",
|
||||
_on_clock_val_change_stop, obj);
|
||||
|
||||
mw = mh = -1;
|
||||
|
@ -440,16 +440,16 @@ _time_update(Evas_Object *obj)
|
|||
edje_object_signal_emit
|
||||
(sd->am_pm_obj, "elm,state,edit,on", "elm");
|
||||
edje_object_signal_callback_add
|
||||
(sd->am_pm_obj, "elm,action,up,start", "",
|
||||
(sd->am_pm_obj, "elm,action,up,start", "*",
|
||||
_on_clock_val_up_start, obj);
|
||||
edje_object_signal_callback_add
|
||||
(sd->am_pm_obj, "elm,action,up,stop", "",
|
||||
(sd->am_pm_obj, "elm,action,up,stop", "*",
|
||||
_on_clock_val_change_stop, obj);
|
||||
edje_object_signal_callback_add
|
||||
(sd->am_pm_obj, "elm,action,down,start", "",
|
||||
(sd->am_pm_obj, "elm,action,down,start", "*",
|
||||
_on_clock_val_down_start, obj);
|
||||
edje_object_signal_callback_add
|
||||
(sd->am_pm_obj, "elm,action,down,stop", "",
|
||||
(sd->am_pm_obj, "elm,action,down,stop", "*",
|
||||
_on_clock_val_change_stop, obj);
|
||||
|
||||
mw = mh = -1;
|
||||
|
|
|
@ -101,7 +101,8 @@ _update_items(Evas_Object *obj)
|
|||
rtl = elm_widget_mirrored_get(obj);
|
||||
EINA_LIST_FOREACH(sd->items, l, it)
|
||||
{
|
||||
elm_object_signal_emit(VIEW(it), it->day_style, "");
|
||||
elm_object_signal_emit(VIEW(it), it->day_style, ""); // XXX: compat
|
||||
elm_object_signal_emit(VIEW(it), it->day_style, "elm");
|
||||
if (it->day == sd->week_start)
|
||||
{
|
||||
if (rtl) elm_object_signal_emit(VIEW(it), ITEM_POS_RIGHT, "elm");
|
||||
|
@ -291,13 +292,13 @@ _elm_dayselector_smart_content_set(Eo *obj, void *_pd, va_list *list)
|
|||
(VIEW(it), EVAS_CALLBACK_DEL, _item_del_cb, obj);
|
||||
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), ITEM_TYPE_WEEKDAY_DEFAULT, "", _item_signal_emit_cb, it);
|
||||
(VIEW(it), ITEM_TYPE_WEEKDAY_DEFAULT, "*", _item_signal_emit_cb, it);
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), ITEM_TYPE_WEEKDAY_STYLE1, "", _item_signal_emit_cb, it);
|
||||
(VIEW(it), ITEM_TYPE_WEEKDAY_STYLE1, "*", _item_signal_emit_cb, it);
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), ITEM_TYPE_WEEKEND_DEFAULT, "", _item_signal_emit_cb, it);
|
||||
(VIEW(it), ITEM_TYPE_WEEKEND_DEFAULT, "*", _item_signal_emit_cb, it);
|
||||
elm_object_signal_callback_add
|
||||
(VIEW(it), ITEM_TYPE_WEEKEND_STYLE1, "", _item_signal_emit_cb, it);
|
||||
(VIEW(it), ITEM_TYPE_WEEKEND_STYLE1, "*", _item_signal_emit_cb, it);
|
||||
|
||||
elm_layout_sizing_eval(obj);
|
||||
_update_items(obj);
|
||||
|
@ -335,13 +336,13 @@ _elm_dayselector_smart_content_unset(Eo *obj, void *_pd, va_list *list)
|
|||
evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _item_del_cb);
|
||||
|
||||
elm_object_signal_callback_del
|
||||
(content, ITEM_TYPE_WEEKDAY_DEFAULT, "", _item_signal_emit_cb);
|
||||
(content, ITEM_TYPE_WEEKDAY_DEFAULT, "*", _item_signal_emit_cb);
|
||||
elm_object_signal_callback_del
|
||||
(content, ITEM_TYPE_WEEKDAY_STYLE1, "", _item_signal_emit_cb);
|
||||
(content, ITEM_TYPE_WEEKDAY_STYLE1, "*", _item_signal_emit_cb);
|
||||
elm_object_signal_callback_del
|
||||
(content, ITEM_TYPE_WEEKEND_DEFAULT, "", _item_signal_emit_cb);
|
||||
(content, ITEM_TYPE_WEEKEND_DEFAULT, "*", _item_signal_emit_cb);
|
||||
elm_object_signal_callback_del
|
||||
(content, ITEM_TYPE_WEEKEND_STYLE1, "", _item_signal_emit_cb);
|
||||
(content, ITEM_TYPE_WEEKEND_STYLE1, "*", _item_signal_emit_cb);
|
||||
|
||||
snprintf(buf, sizeof(buf), "day%d,default", _item_location_get(sd, it));
|
||||
elm_layout_signal_emit(obj, buf, "elm");
|
||||
|
|
|
@ -658,7 +658,7 @@ _item_new(Evas_Object *obj,
|
|||
{
|
||||
_item_text_set_hook((Elm_Object_Item *)it, "default", it->label);
|
||||
edje_object_signal_callback_add
|
||||
(VIEW(it), "elm,action,click", "", _item_click_cb, it);
|
||||
(VIEW(it), "elm,action,click", "*", _item_click_cb, it);
|
||||
}
|
||||
|
||||
//XXX: ACCESS
|
||||
|
|
|
@ -612,7 +612,8 @@ _item_contract_emit(Elm_Gen_Item *it)
|
|||
Elm_Gen_Item *it2;
|
||||
Eina_List *l;
|
||||
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,contract_flip", "");
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,contract_flip", ""); // XXX: for compat
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,contract_flip", "elm");
|
||||
it->item->tree_effect_finished = EINA_FALSE;
|
||||
|
||||
EINA_LIST_FOREACH(it->item->items, l, it2)
|
||||
|
@ -634,7 +635,10 @@ _item_tree_effect_before(Elm_Gen_Item *it)
|
|||
it2->item->tree_effect_hide_me = EINA_TRUE;
|
||||
if (sd->move_effect_mode ==
|
||||
ELM_GENLIST_TREE_EFFECT_EXPAND)
|
||||
edje_object_signal_emit(VIEW(it2), "elm,state,hide", "");
|
||||
{
|
||||
edje_object_signal_emit(VIEW(it2), "elm,state,hide", ""); // XXX: for compat
|
||||
edje_object_signal_emit(VIEW(it2), "elm,state,hide", "elm");
|
||||
}
|
||||
else if (sd->move_effect_mode ==
|
||||
ELM_GENLIST_TREE_EFFECT_CONTRACT)
|
||||
_item_contract_emit(it2);
|
||||
|
@ -686,7 +690,8 @@ _item_tree_effect(Elm_Genlist_Smart_Data *sd,
|
|||
{
|
||||
if (!it->item->tree_effect_finished)
|
||||
{
|
||||
edje_object_signal_emit(VIEW(it), "flip_item", "");
|
||||
edje_object_signal_emit(VIEW(it), "flip_item", ""); // XXX: for compat
|
||||
edje_object_signal_emit(VIEW(it), "elm,action,flip_item", "elm");
|
||||
_item_position
|
||||
(it, VIEW(it), it->item->scrl_x, it->item->scrl_y);
|
||||
it->item->tree_effect_finished = EINA_TRUE;
|
||||
|
@ -708,7 +713,8 @@ _item_tree_effect(Elm_Genlist_Smart_Data *sd,
|
|||
{
|
||||
if (!it->item->tree_effect_finished)
|
||||
{
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,hide", "");
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,hide", ""); // XXX: for compat
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,hide", "elm");
|
||||
it->item->tree_effect_finished = EINA_TRUE;
|
||||
}
|
||||
}
|
||||
|
@ -774,7 +780,10 @@ _item_tree_effect_finish(Elm_Genlist_Smart_Data *sd)
|
|||
it->item->old_scrl_y = it->item->scrl_y;
|
||||
if (GL_IT(it)->wsd->move_effect_mode ==
|
||||
ELM_GENLIST_TREE_EFFECT_EXPAND)
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,show", "");
|
||||
{
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,show", ""); // XXX: for compat
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,show", "elm");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1710,7 +1719,10 @@ _item_realize(Elm_Gen_Item *it,
|
|||
{
|
||||
if (sd->move_effect_mode
|
||||
!= ELM_GENLIST_TREE_EFFECT_NONE)
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,hide", "");
|
||||
{
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,hide", ""); // XXX: for compat
|
||||
edje_object_signal_emit(VIEW(it), "elm,state,hide", "elm");
|
||||
}
|
||||
it->item->tree_effect_hide_me = EINA_FALSE;
|
||||
}
|
||||
|
||||
|
@ -1877,7 +1889,8 @@ _tree_effect_animator_cb(void *data)
|
|||
if (t >= (((num - 1) * effect_duration) /
|
||||
expanded_item_num))
|
||||
{
|
||||
edje_object_signal_emit(VIEW(it), "flip_item", "");
|
||||
edje_object_signal_emit(VIEW(it), "flip_item", ""); // XXX: for compat
|
||||
edje_object_signal_emit(VIEW(it), "elm,action,flip_item", "elm");
|
||||
_item_position(it, VIEW(it), it->item->scrl_x,
|
||||
it->item->scrl_y);
|
||||
it->item->tree_effect_finished = EINA_TRUE;
|
||||
|
|
|
@ -553,7 +553,7 @@ _elm_hover_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
CRITICAL("Failed to set layout!");
|
||||
|
||||
elm_layout_signal_callback_add
|
||||
(obj, "elm,action,dismiss", "", _hov_dismiss_cb, obj);
|
||||
(obj, "elm,action,dismiss", "*", _hov_dismiss_cb, obj);
|
||||
|
||||
priv->offset = evas_object_rectangle_add(evas_object_evas_get(obj));
|
||||
evas_object_pass_events_set(priv->offset, EINA_TRUE);
|
||||
|
@ -830,7 +830,8 @@ elm_hover_dismiss(Evas_Object *obj)
|
|||
static void
|
||||
_elm_hover_dismiss(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
elm_layout_signal_emit(obj, "elm,action,dismiss", "");
|
||||
elm_layout_signal_emit(obj, "elm,action,dismiss", ""); // XXX: for compat
|
||||
elm_layout_signal_emit(obj, "elm,action,dismiss", "elm");
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -495,11 +495,11 @@ _item_obj_create(Elm_Menu_Item *item)
|
|||
CRITICAL("Failed to set layout!");
|
||||
else
|
||||
{
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,click", "",
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,click", "*",
|
||||
_menu_item_select_cb, item);
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,activate", "",
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,activate", "*",
|
||||
_menu_item_activate_cb, item);
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,inactivate", "",
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,inactivate", "*",
|
||||
_menu_item_inactivate_cb,
|
||||
item);
|
||||
evas_object_show(VIEW(item));
|
||||
|
@ -519,7 +519,7 @@ _item_separator_obj_create(Elm_Menu_Item *item)
|
|||
else
|
||||
{
|
||||
elm_layout_signal_callback_add
|
||||
(VIEW(item), "elm,action,activate", "", _menu_item_activate_cb, item);
|
||||
(VIEW(item), "elm,action,activate", "*", _menu_item_activate_cb, item);
|
||||
evas_object_show(VIEW(item));
|
||||
}
|
||||
}
|
||||
|
@ -573,7 +573,7 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
|
|||
if (item->icon_str)
|
||||
elm_menu_item_icon_name_set((Elm_Object_Item *)item, item->icon_str);
|
||||
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,open", "",
|
||||
elm_layout_signal_callback_add(VIEW(item), "elm,action,open", "*",
|
||||
_submenu_open_cb, item);
|
||||
evas_object_event_callback_add
|
||||
(VIEW(item), EVAS_CALLBACK_MOVE, _item_move_resize_cb, item);
|
||||
|
|
|
@ -280,7 +280,7 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
CRITICAL("Failed to set layout!");
|
||||
|
||||
elm_layout_signal_callback_add
|
||||
(obj, "elm,action,radio,toggle", "", _radio_on_cb, obj);
|
||||
(obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj);
|
||||
|
||||
priv->group = calloc(1, sizeof(Group));
|
||||
priv->group->radios = eina_list_append(priv->group->radios, obj);
|
||||
|
|
|
@ -299,7 +299,8 @@ _popup_show(void *data,
|
|||
evas_object_layer_set(sd->popup, evas_object_layer_get(data));
|
||||
evas_object_raise(sd->popup);
|
||||
evas_object_show(sd->popup);
|
||||
edje_object_signal_emit(sd->popup, "popup,show", "elm");
|
||||
edje_object_signal_emit(sd->popup, "popup,show", "elm"); // XXX: for compat
|
||||
edje_object_signal_emit(sd->popup, "elm,popup,show", "elm");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -314,7 +315,8 @@ _popup_hide(void *data,
|
|||
{
|
||||
if (!sd->popup_hiding)
|
||||
{
|
||||
edje_object_signal_emit(sd->popup, "popup,hide", "elm");
|
||||
edje_object_signal_emit(sd->popup, "popup,hide", "elm"); // XXX: for compat
|
||||
edje_object_signal_emit(sd->popup, "elm,popup,hide", "elm");
|
||||
sd->popup_hiding = EINA_TRUE;
|
||||
}
|
||||
}
|
||||
|
@ -812,8 +814,10 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
elm_layout_signal_callback_add(obj, "drag,stop", "*", _drag_stop, obj);
|
||||
elm_layout_signal_callback_add(obj, "drag,step", "*", _drag_step, obj);
|
||||
elm_layout_signal_callback_add(obj, "drag,page", "*", _drag_stop, obj);
|
||||
elm_layout_signal_callback_add(obj, "popup,show", "elm", _popup_show, obj);
|
||||
elm_layout_signal_callback_add(obj, "popup,hide", "elm", _popup_hide, obj);
|
||||
elm_layout_signal_callback_add(obj, "popup,show", "elm", _popup_show, obj); // XXX: for compat
|
||||
elm_layout_signal_callback_add(obj, "popup,hide", "elm", _popup_hide, obj); // XXX: for compat
|
||||
elm_layout_signal_callback_add(obj, "elm,popup,show", "elm", _popup_show, obj);
|
||||
elm_layout_signal_callback_add(obj, "elm,popup,hide", "elm", _popup_hide, obj);
|
||||
elm_layout_signal_callback_add(obj, "*", "popup,emit", _popup_emit, obj);
|
||||
edje_object_part_drag_value_set
|
||||
(wd->resize_obj, "elm.dragable.slider", 0.0, 0.0);
|
||||
|
@ -833,7 +837,9 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
elm_widget_style_get(obj));
|
||||
edje_object_scale_set(priv->popup, elm_widget_scale_get(obj) *
|
||||
elm_config_scale_get());
|
||||
edje_object_signal_callback_add(priv->popup, "popup,hide,done", "elm",
|
||||
edje_object_signal_callback_add(priv->popup, "popup,hide,done", "elm", // XXX: for compat
|
||||
_popup_hide_done, obj);
|
||||
edje_object_signal_callback_add(priv->popup, "elm,popup,hide,done", "elm",
|
||||
_popup_hide_done, obj);
|
||||
|
||||
/* create a rectangle to track position+size of the dragable */
|
||||
|
|
|
@ -259,7 +259,7 @@ _on_slideshow_end(void *data,
|
|||
elm_layout_content_unset(data, "elm.swallow.2");
|
||||
|
||||
elm_layout_content_set(data, "elm.swallow.1", VIEW(item));
|
||||
elm_layout_signal_emit(data, "anim,end", "elm");
|
||||
elm_layout_signal_emit(data, "elm,anim,end", "elm");
|
||||
// XXX: fort backwards compat
|
||||
elm_layout_signal_emit(data, "anim,end", "slideshow");
|
||||
|
||||
|
@ -340,7 +340,7 @@ _elm_slideshow_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
priv->layout.current = eina_list_data_get(priv->layout.list);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "end", "elm", _on_slideshow_end,
|
||||
(wd->resize_obj, "elm,end", "elm", _on_slideshow_end,
|
||||
obj);
|
||||
// XXX: for backwards compat :(
|
||||
edje_object_signal_callback_add
|
||||
|
@ -490,12 +490,16 @@ elm_slideshow_item_show(Elm_Object_Item *it)
|
|||
_item_realize(next);
|
||||
elm_layout_content_set(WIDGET(item), "elm.swallow.2", VIEW(next));
|
||||
|
||||
if (!sd->transition)
|
||||
sprintf(buf, "elm,none,next");
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "elm,%s,next", sd->transition);
|
||||
elm_layout_signal_emit(WIDGET(item), buf, "elm");
|
||||
// XXX: for backwards compat
|
||||
if (!sd->transition)
|
||||
sprintf(buf,"none,next");
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "%s,next", sd->transition);
|
||||
elm_layout_signal_emit(WIDGET(item), buf, "elm");
|
||||
// XXX: for backwards compat
|
||||
elm_layout_signal_emit(WIDGET(item), buf, "slideshow");
|
||||
|
||||
sd->previous = sd->current;
|
||||
|
@ -532,12 +536,16 @@ _elm_slideshow_next(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
|
||||
elm_layout_content_set(obj, "elm.swallow.2", VIEW(next));
|
||||
|
||||
if (!sd->transition)
|
||||
sprintf(buf, "elm,none,next");
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "elm,%s,next", sd->transition);
|
||||
elm_layout_signal_emit(obj, buf, "elm");
|
||||
// XXX: for backwards compat
|
||||
if (!sd->transition)
|
||||
sprintf(buf,"none,next");
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "%s,next", sd->transition);
|
||||
elm_layout_signal_emit(obj, buf, "elm");
|
||||
// XXX: for backwards compat
|
||||
elm_layout_signal_emit(obj, buf, "slideshow");
|
||||
|
||||
sd->previous = sd->current;
|
||||
|
@ -574,12 +582,16 @@ _elm_slideshow_previous(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
|
||||
elm_layout_content_set(obj, "elm.swallow.2", VIEW(prev));
|
||||
|
||||
if (!sd->transition)
|
||||
sprintf(buf, "elm,none,previous");
|
||||
else
|
||||
snprintf(buf, 1024, "elm,%s,previous", sd->transition);
|
||||
elm_layout_signal_emit(obj, buf, "elm");
|
||||
// XXX: for backwards compat
|
||||
if (!sd->transition)
|
||||
sprintf(buf,"none,previous");
|
||||
else
|
||||
snprintf(buf, 1024, "%s,previous", sd->transition);
|
||||
elm_layout_signal_emit(obj, buf, "elm");
|
||||
// XXX: for backwards compat
|
||||
elm_layout_signal_emit(obj, buf, "slideshow");
|
||||
|
||||
sd->previous = sd->current;
|
||||
|
@ -746,9 +758,10 @@ _elm_slideshow_layout_set(Eo *obj, void *_pd, va_list *list)
|
|||
Elm_Slideshow_Smart_Data *sd = _pd;
|
||||
|
||||
sd->layout.current = layout;
|
||||
snprintf(buf, sizeof(buf), "layout,%s", layout);
|
||||
snprintf(buf, sizeof(buf), "elm,layout,%s", layout);
|
||||
elm_layout_signal_emit(obj, buf, "elm");
|
||||
// XXX: for bakcwards compat
|
||||
snprintf(buf, sizeof(buf), "layout,%s", layout);
|
||||
elm_layout_signal_emit(obj, buf, "slideshow");
|
||||
}
|
||||
|
||||
|
|
|
@ -1102,11 +1102,11 @@ _animate_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
|
|||
if ((sd->is_video) && (sd->thumb.format == ETHUMB_THUMB_EET))
|
||||
{
|
||||
if (setting == ELM_THUMB_ANIMATION_LOOP)
|
||||
edje_object_signal_emit(sd->view, "animate_loop", "");
|
||||
edje_object_signal_emit(sd->view, "elm,action,animate_loop", "elm");
|
||||
else if (setting == ELM_THUMB_ANIMATION_START)
|
||||
edje_object_signal_emit(sd->view, "animate", "");
|
||||
edje_object_signal_emit(sd->view, "elm,action,animate", "elm");
|
||||
else if (setting == ELM_THUMB_ANIMATION_STOP)
|
||||
edje_object_signal_emit(sd->view, "animate_stop", "");
|
||||
edje_object_signal_emit(sd->view, "elm,action,animate_stop", "elm");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -2124,10 +2124,10 @@ _elm_win_focus_highlight_init(Elm_Win_Smart_Data *sd)
|
|||
sd->focus_highlight.theme_changed = EINA_TRUE;
|
||||
|
||||
edje_object_signal_callback_add(sd->focus_highlight.fobj,
|
||||
"elm,action,focus,hide,end", "",
|
||||
"elm,action,focus,hide,end", "*",
|
||||
_elm_win_focus_highlight_hide, NULL);
|
||||
edje_object_signal_callback_add(sd->focus_highlight.fobj,
|
||||
"elm,action,focus,anim,end", "",
|
||||
"elm,action,focus,anim,end", "*",
|
||||
_elm_win_focus_highlight_anim_end, sd->obj);
|
||||
_elm_win_focus_highlight_reconfigure_job_start(sd);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue