diff options
| author | WooHyun Jung <wh0705.jung@samsung.com> | 2019-07-29 11:42:34 +0200 |
|---|---|---|
| committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-07-29 11:43:01 +0200 |
| commit | 77e268e6aba2d07b9d4b06c83515041775210c27 (patch) | |
| tree | f50da1eada65a948147a62ede0cc815e66105784 /src/bin | |
| parent | 9b294d6284fbda62dde20bcb31732a1c63a65962 (diff) | |
| download | efl-77e268e6aba2d07b9d4b06c83515041775210c27.tar.gz | |
efl_input_clickable: rename efl_ui_clickable to efl_input_clickable
Summary:
Renamed all efl_ui_clickable_XXX to efl_input_clickable_XXX based on
the discussion in T7847
ref T7847 T7976
Reviewers: zmike, bu5hm4n, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7976, T7847
Differential Revision: https://phab.enlightenment.org/D9427
Diffstat (limited to 'src/bin')
29 files changed, 198 insertions, 198 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index fb8b4f5f33..ebcb3ded07 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c @@ -358,7 +358,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_file_set(efl_added, buf), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), efl_gfx_hint_align_set(efl_added, 0.5, 0.5), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _file_cb, win), efl_pack(box, efl_added)); snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); @@ -366,7 +366,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_file_set(efl_added, buf), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), efl_gfx_hint_align_set(efl_added, 0.5, 0.5), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _image_cb, win), efl_pack(box, efl_added)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200)); diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c index 9993204468..a939304965 100644 --- a/src/bin/elementary/test_efl_ui_text.c +++ b/src/bin/elementary/test_efl_ui_text.c @@ -184,14 +184,14 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Sel"); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt3_clicked, en); efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Wr"); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt6_clicked, en); efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); @@ -376,21 +376,21 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Image"); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_image_clicked, en); efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Emoticon"); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en); efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); efl_text_set(bt, "Factory"); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_factory_clicked, en); efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); efl_pack(bx2, bt); elm_object_focus_allow_set(bt, EINA_FALSE); diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c index 5b470e0845..4a263e0a44 100644 --- a/src/bin/elementary/test_evas_mask.c +++ b/src/bin/elementary/test_evas_mask.c @@ -182,19 +182,19 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event // FIXME: button EO API efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Toggle mask (image)"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_mask, ly), efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_pack(box2, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Toggle map"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, ly), efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_pack(box2, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Rotate Window"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _rotate_win, win), efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_pack(box2, efl_added)); diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c index 4cb8ed1b53..dba6570588 100644 --- a/src/bin/elementary/test_evas_snapshot.c +++ b/src/bin/elementary/test_evas_snapshot.c @@ -184,25 +184,25 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_text_set(efl_added, "Toggle animation"), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _anim_toggle, win)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Save to file"), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _save_image, win)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Map"), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, win)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Close"), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_pack(box, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _close_do, win)); efl_key_wref_set(win, "snap", snap); efl_key_wref_set(win, "table", table); diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c index 614b9fa2ac..4b36bf4b35 100644 --- a/src/bin/elementary/test_events.c +++ b/src/bin/elementary/test_events.c @@ -227,9 +227,9 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); efl_pack(bx, o); - efl_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td); + efl_event_callback_add(td->button, EFL_INPUT_EVENT_CLICKED, _clicked_button1, td); efl_event_callback_array_add(td->button, button_pointer_callbacks(), (void*)(intptr_t)0x1); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _clicked_button2, td); efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, td); efl_event_callback_array_add(o, rect_pointer_callbacks(), td); efl_event_callback_array_add(win, win_key_callbacks(), td); diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index fed75a9359..4fdee9dccb 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -378,7 +378,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_text_set(efl_added, "Flip"), efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _flip_click, win)); efl_pack(box2, o); } @@ -409,7 +409,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve elm_object_tooltip_text_set(efl_added, images[k].src_name)); if (efl_player_playable_get(o)) efl_player_play_set(o, 1); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _img_click, win); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _img_click, win); efl_pack(box2, o); } diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c index cc01014c04..d3d6ea3629 100644 --- a/src/bin/elementary/test_part_bg.c +++ b/src/bin/elementary/test_part_bg.c @@ -181,9 +181,9 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void radio_group = _create_box_contents(vbox); - efl_event_callback_add(reset_btn, EFL_UI_EVENT_CLICKED, _reset_cb, radio_group); - efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group); - efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group); + efl_event_callback_add(reset_btn, EFL_INPUT_EVENT_CLICKED, _reset_cb, radio_group); + efl_event_callback_add(color_btn, EFL_INPUT_EVENT_CLICKED, _color_cb, radio_group); + efl_event_callback_add(scale_btn, EFL_INPUT_EVENT_CLICKED, _scale_type_cb, radio_group); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200)); } diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c index 44e75143c9..8378473903 100644 --- a/src/bin/elementary/test_part_shadow.c +++ b/src/bin/elementary/test_part_shadow.c @@ -181,12 +181,12 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_pack(bx, bt_bx); bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start")); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_start, td); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_start, td); efl_pack(bt_bx, bt); td->btn_start = bt; bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Stop")); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_stop, td); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_stop, td); efl_ui_widget_disabled_set(bt, EINA_TRUE); efl_pack(bt_bx, bt); td->btn_stop = bt; diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c index bbbbb1fe88..42ef33f671 100644 --- a/src/bin/elementary/test_photocam.c +++ b/src/bin/elementary/test_photocam.c @@ -827,7 +827,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE efl_file_set(efl_added, buf), efl_file_load(efl_added), efl_pack(bx, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _zoomable_clicked_cb, NULL) + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _zoomable_clicked_cb, NULL) ); if (efl_player_playable_get(zoomable)) diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c index 079f9c66d3..62be0bca4f 100644 --- a/src/bin/elementary/test_ui_button.c +++ b/src/bin/elementary/test_ui_button.c @@ -42,18 +42,18 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_add(EFL_UI_BUTTON_CLASS, bx, efl_text_set(efl_added, "Text"), efl_pack(bx, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL) + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL) ); // Icon Only Button snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); btn = efl_add(EFL_UI_BUTTON_CLASS, bx, efl_pack(bx, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL) + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL) ); efl_add(EFL_UI_IMAGE_CLASS, btn, efl_file_set(efl_added, buf), @@ -65,9 +65,9 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event btn = efl_add(EFL_UI_BUTTON_CLASS, bx, efl_text_set(efl_added, "Text + Icon"), efl_pack(bx, efl_added), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), - efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL) + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL) ); efl_add(EFL_UI_IMAGE_CLASS, btn, efl_file_set(efl_added, buf), diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c index 936efd1d3b..d8cfd175e1 100644 --- a/src/bin/elementary/test_ui_clock.c +++ b/src/bin/elementary/test_ui_clock.c @@ -102,6 +102,6 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Back to the future..."), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c index 8491a7f4cd..482abe6d8d 100644 --- a/src/bin/elementary/test_ui_image.c +++ b/src/bin/elementary/test_ui_image.c @@ -573,13 +573,13 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf { bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Image Reload"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _reload_clicked, win) + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _reload_clicked, win) ); efl_pack(hbox, bt); bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Image Switch"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _switch_clicked, win) + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _switch_clicked, win) ); efl_pack(hbox, bt); } diff --git a/src/bin/elementary/test_ui_item_container.c b/src/bin/elementary/test_ui_item_container.c index 97f3f0797b..e87a6ba9a7 100644 --- a/src/bin/elementary/test_ui_item_container.c +++ b/src/bin/elementary/test_ui_item_container.c @@ -175,21 +175,21 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_text_set(o, "Scroll to 1154 ANIMATED"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_animated_cb, item_container); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_animated_cb, item_container); efl_pack_table(tbl, o, 0, 1, 1, 1); o = efl_add(EFL_UI_BUTTON_CLASS, tbl, efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_text_set(o, "Scroll to 10"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_cb, item_container); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_cb, item_container); efl_pack_table(tbl, o, 0, 2, 1, 1); o = efl_add(EFL_UI_BUTTON_CLASS, tbl, efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_text_set(o, "Change min size of 0"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _change_min_size_cb, item_container); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _change_min_size_cb, item_container); efl_pack_table(tbl, o, 0, 3, 1, 1); o = efl_add(EFL_UI_CHECK_CLASS, tbl, @@ -221,21 +221,21 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_text_set(o, "Remove all items"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _remove_all_cb, item_container); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _remove_all_cb, item_container); efl_pack_table(tbl, o, 0, 7, 1, 1); o = efl_add(EFL_UI_BUTTON_CLASS, tbl, efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_text_set(o, "Add 1 item"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_one_item, item_container); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_one_item, item_container); efl_pack_table(tbl, o, 0, 8, 1, 1); o = efl_add(EFL_UI_BUTTON_CLASS, tbl, efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_text_set(o, "Add 1000 item"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_thousend_items, item_container); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_thousend_items, item_container); efl_pack_table(tbl, o, 0, 9, 1, 1); bx = efl_add(EFL_UI_RADIO_BOX_CLASS, tbl, diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c index 6fcf48f763..c6d1aa084b 100644 --- a/src/bin/elementary/test_ui_pager.c +++ b/src/bin/elementary/test_ui_pager.c @@ -337,7 +337,7 @@ static void page_size_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -439,7 +439,7 @@ static void pack_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -478,7 +478,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Begin"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -496,7 +496,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack End"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -514,7 +514,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Before Current Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -532,7 +532,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack After Current Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -550,7 +550,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, in_box1, efl_text_set(efl_added, "Pack At"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -569,7 +569,7 @@ static void pack_cb(void *data, pack_param->unpack_btn = btn; pack_param->type = UNPACK_AT; - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param); efl_event_callback_add(btn, EFL_EVENT_DEL, pack_btn_del_cb, pack_param); @@ -603,7 +603,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Clear"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -624,7 +624,7 @@ static void current_page_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -656,7 +656,7 @@ static void current_page_cb(void *data, psp->pager = pager; psp->spinner = sp; - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp); efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp); } @@ -670,7 +670,7 @@ static void indicator_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -680,13 +680,13 @@ static void indicator_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Icon Type"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, indicator_icon_btn_cb, params), efl_pack_end(box, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "None"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, indicator_none_btn_cb, params), efl_pack_end(box, efl_added)); } @@ -735,13 +735,13 @@ void test_ui_pager(void *data EINA_UNUSED, efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Prev"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, prev_btn_cb, pager), + EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager), efl_content_set(efl_part(layout, "prev_btn"), efl_added)); efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Next"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, next_btn_cb, pager), + EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager), efl_content_set(efl_part(layout, "next_btn"), efl_added)); params = calloc(1, sizeof(Params)); diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c index 6e6c7d1f49..a7e564acbd 100644 --- a/src/bin/elementary/test_ui_pager_scroll.c +++ b/src/bin/elementary/test_ui_pager_scroll.c @@ -391,7 +391,7 @@ static void page_size_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -491,7 +491,7 @@ static void padding_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -518,7 +518,7 @@ static void side_page_num_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -551,7 +551,7 @@ static void pack_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -590,7 +590,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Begin"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -608,7 +608,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack End"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -626,7 +626,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Before Current Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -644,7 +644,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack After Current Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -662,7 +662,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, in_box1, efl_text_set(efl_added, "Pack At"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -681,7 +681,7 @@ static void pack_cb(void *data, pack_param->unpack_btn = btn; pack_param->type = UNPACK_AT; - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param); efl_event_callback_add(btn, EFL_EVENT_DEL, pack_btn_del_cb, pack_param); @@ -715,7 +715,7 @@ static void pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Clear"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -735,7 +735,7 @@ static void current_page_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -767,7 +767,7 @@ static void current_page_cb(void *data, psp->pager = pager; psp->spinner = sp; - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp); efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp); } @@ -783,7 +783,7 @@ static void scroll_block_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -822,7 +822,7 @@ static void loop_cb(void *data EINA_UNUSED, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_RADIO_BOX_CLASS, navi, @@ -870,7 +870,7 @@ static void indicator_cb(void *data EINA_UNUSED, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -880,13 +880,13 @@ static void indicator_cb(void *data EINA_UNUSED, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Icon Type"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, indicator_icon_btn_cb, params), efl_pack_end(box, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "None"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, indicator_none_btn_cb, params), efl_pack_end(box, efl_added)); } @@ -936,13 +936,13 @@ void test_ui_pager_scroll(void *data EINA_UNUSED, efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Prev"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, prev_btn_cb, pager), + EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager), efl_content_set(efl_part(layout, "prev_btn"), efl_added)); efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Next"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, next_btn_cb, pager), + EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager), efl_content_set(efl_part(layout, "next_btn"), efl_added)); tran = efl_add(EFL_PAGE_TRANSITION_SCROLL_CLASS, pager, diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c index 22bd1a6ad4..ac08ff878a 100644 --- a/src/bin/elementary/test_ui_panel.c +++ b/src/bin/elementary/test_ui_panel.c @@ -154,7 +154,7 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_content_set(panel, list); efl_event_callback_add(panel, EFL_UI_PANEL_EVENT_TOGGLED, _panel_toggled, check); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _btn_clicked, panel); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _btn_clicked, panel); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); } diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c index d70592c70a..6fa397234f 100644 --- a/src/bin/elementary/test_ui_popup.c +++ b/src/bin/elementary/test_ui_popup.c @@ -251,7 +251,7 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100)); efl_text_set(repeat_test_btn, "Repeat Event Test"); - efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL); + efl_event_callback_add(repeat_test_btn, EFL_INPUT_EVENT_CLICKED, _repeat_test_cb, NULL); efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE); p_data->win = win; @@ -263,73 +263,73 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ efl_text_set(create_btn, "Create Popup"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _create_cb, p_data); Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(delete_btn, "Delete Popup"); efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0)); efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data); + efl_event_callback_add(delete_btn, EFL_INPUT_EVENT_CLICKED, _delete_cb, p_data); Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(repeat_event_btn, "Repeat Event Set"); efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50)); efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data); + efl_event_callback_add(repeat_event_btn, EFL_INPUT_EVENT_CLICKED, _repeat_event_cb, p_data); Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(dummy_btn, "Show Dummy Button"); efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50)); efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data); + efl_event_callback_add(dummy_btn, EFL_INPUT_EVENT_CLICKED, _dummy_cb, p_data); Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100)); efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50)); efl_text_set(backwall_btn, "Backwall Set"); - efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data); + efl_event_callback_add(backwall_btn, EFL_INPUT_EVENT_CLICKED, _backwall_cb, p_data); Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(timeout_btn, "Timeout Set"); efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100)); efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data); + efl_event_callback_add(timeout_btn, EFL_INPUT_EVENT_CLICKED, _timeout_set_cb, p_data); Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(center_btn, "Center Align"); efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150)); efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); + efl_event_callback_add(center_btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data); Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(top_btn, "Top Align"); efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150)); efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); + efl_event_callback_add(top_btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data); Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(left_btn, "Left Align"); efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200)); efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); + efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data); Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(right_btn, "Right Align"); efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200)); efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); + efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data); Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(bottom_btn, "Bottom Align"); efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250)); efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); + efl_event_callback_add(bottom_btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data); Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); efl_text_set(position_btn, "Position Set (x:0, y:0)"); efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250)); efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50)); - efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); + efl_event_callback_add(position_btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data); } static void @@ -517,31 +517,31 @@ test_ui_scroll_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case1_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case2_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case3_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case4_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case5_cb, win); } static void @@ -900,85 +900,85 @@ test_ui_text_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case1_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case2_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case3_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case4_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case5_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case6_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case7_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case8_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case9_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case10_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case11_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case12_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case13_cb, win); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)"); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650)); efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); - efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win); + efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case14_cb, win); } static void @@ -1036,7 +1036,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(btn, "anchor"); efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup); snprintf(buf, sizeof(buf), "anchor%d", i+1); efl_content_set(efl_part(layout, buf), btn); @@ -1045,7 +1045,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void btn = efl_add(EFL_UI_BUTTON_CLASS, win); efl_text_set(btn, "anchor none"); efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup); efl_content_set(efl_part(layout, "anchor_none"), btn); Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup); @@ -1054,43 +1054,43 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Center Align"); efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data); efl_pack_table(table, btn, 0, 0, 2, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Top Align"); efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data); efl_pack_table(table, btn, 2, 0, 2, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Bottom Align"); efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data); efl_pack_table(table, btn, 4, 0, 2, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Left Align"); efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data); efl_pack_table(table, btn, 0, 1, 3, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Right Align"); efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data); efl_pack_table(table, btn, 3, 1, 3, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Position Set"); efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data); efl_pack_table(table, btn, 0, 2, 3, 1); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); efl_text_set(btn, "Resize"); efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _popup_resize_cb, p_data); efl_pack_table(table, btn, 3, 2, 3, 1); efl_content_set(efl_ui_popup, table); diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c index 5a1c705a03..943c57404a 100644 --- a/src/bin/elementary/test_ui_progressbar.c +++ b/src/bin/elementary/test_ui_progressbar.c @@ -224,20 +224,20 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx, efl_text_set(efl_added, "start"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _start_btn_clicked_cb, pd), efl_pack(btbx, efl_added) ); pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx, efl_text_set(efl_added, "stop"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _stop_btn_clicked_cb, pd), efl_pack(btbx, efl_added) ); pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx, efl_text_set(efl_added, "reset"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _reset_btn_clicked_cb, pd), efl_pack(btbx, efl_added) ); diff --git a/src/bin/elementary/test_ui_radio.c b/src/bin/elementary/test_ui_radio.c index 7f72df92f7..c6cb3d2033 100644 --- a/src/bin/elementary/test_ui_radio.c +++ b/src/bin/elementary/test_ui_radio.c @@ -119,18 +119,18 @@ void test_efl_ui_radio(void *data EINA_UNUSED, o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_pack_table(table, o, 1, 0, 1, 1); efl_text_set(o, "Selected France check"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2)); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2)); o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_pack_table(table, o, 1, 1, 1, 1); efl_text_set(o, "Set value for Germany"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_btn_clicked, bx); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_btn_clicked, bx); o = efl_add(EFL_UI_BUTTON_CLASS, table); efl_pack_table(table, o, 1, 2, 1, 1); efl_text_set(o, "Set object for UK"); efl_key_data_set(o, "uk", uk); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_object_btn_clicked, bx); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_object_btn_clicked, bx); eina_array_free(arr); } diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c index c108dd6cf7..2632f34353 100644 --- a/src/bin/elementary/test_ui_relative_layout.c +++ b/src/bin/elementary/test_ui_relative_layout.c @@ -167,7 +167,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option) efl_key_wref_set(efl_added, "to", to), efl_key_wref_set(efl_added, "btn", btn), efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option), efl_pack(hbox, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, hbox, @@ -308,7 +308,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo btn1 = efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "button1"), efl_gfx_hint_align_set(efl_added, 0.0, 0.0), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_color_clicked_cb, layout), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_color_clicked_cb, layout), efl_ui_relative_layout_relation_right_set(layout, efl_added, layout, 0.0), efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0)); diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c index f3b6152b2b..a042039109 100644 --- a/src/bin/elementary/test_ui_scroller.c +++ b/src/bin/elementary/test_ui_scroller.c @@ -60,7 +60,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_text_set(efl_added, "Vertical"), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } @@ -76,7 +76,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void { efl_add(EFL_UI_BUTTON_CLASS, bx2, efl_text_set(efl_added, "... Horizontal scrolling ..."), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx2, efl_added)); } @@ -86,7 +86,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_text_set(efl_added, "Vertical"), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } @@ -114,7 +114,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void { efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Both"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack_table(gd2, efl_added, i, j, 1, 1)); } } @@ -125,7 +125,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_text_set(efl_added, "Vertical"), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } } @@ -161,7 +161,7 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED efl_text_set(efl_added, "Vertical"), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack(bx, efl_added)); } } @@ -197,13 +197,13 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE efl_text_set(efl_added, "Vertical"), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack_table(tb, efl_added, 0, i, 1, 1)); efl_add(EFL_UI_BUTTON_CLASS, tb, efl_text_set(efl_added, "Horizontal"), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL), efl_pack_table(tb, efl_added, 1, i, 1, 1)); } } diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c index f07a42778a..01b0ff38a3 100644 --- a/src/bin/elementary/test_ui_spin.c +++ b/src/bin/elementary/test_ui_spin.c @@ -58,12 +58,12 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i efl_add(EFL_UI_BUTTON_CLASS, bx, efl_text_set(efl_added, "Increse Spinner value"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _inc_clicked, sp), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _inc_clicked, sp), efl_pack(bx, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, bx, efl_text_set(efl_added, "Decrease Spinner value"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _dec_clicked, sp), efl_pack(bx, efl_added)); efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 120)); diff --git a/src/bin/elementary/test_ui_spotlight.c b/src/bin/elementary/test_ui_spotlight.c index ff0cbdd6f5..428ea52066 100644 --- a/src/bin/elementary/test_ui_spotlight.c +++ b/src/bin/elementary/test_ui_spotlight.c @@ -101,7 +101,7 @@ view_add(View_Type p, Eo *parent) case BUTTON: page = efl_add(EFL_UI_BUTTON_CLASS, parent, efl_text_set(efl_added, "Button Page")); - efl_event_callback_add(page, EFL_UI_EVENT_CLICKED, page_clicked_cb, NULL); + efl_event_callback_add(page, EFL_INPUT_EVENT_CLICKED, page_clicked_cb, NULL); efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); break; @@ -370,7 +370,7 @@ spotlight_size(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -479,7 +479,7 @@ view_animation_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -508,7 +508,7 @@ pack_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -549,7 +549,7 @@ pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Begin"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -567,7 +567,7 @@ pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack End"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -585,7 +585,7 @@ pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Before Current Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -603,7 +603,7 @@ pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack After Current Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -621,7 +621,7 @@ pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, in_box1, efl_text_set(efl_added, "Pack At"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -640,7 +640,7 @@ pack_cb(void *data, pack_param->unpack_btn = btn; pack_param->type = UNPACK_AT; - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param); efl_event_callback_add(btn, EFL_EVENT_DEL, pack_btn_del_cb, pack_param); @@ -674,7 +674,7 @@ pack_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Clear"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, pack_btn_cb, pack_param), efl_event_callback_add(efl_added, EFL_EVENT_DEL, pack_btn_del_cb, pack_param), @@ -695,7 +695,7 @@ active_index_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -727,7 +727,7 @@ active_index_cb(void *data, psp->spotlight = spotlight; psp->spinner = sp; - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp); efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp); } @@ -742,7 +742,7 @@ indicator_cb(void *data, btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, back_btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, @@ -752,13 +752,13 @@ indicator_cb(void *data, efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Icon Type"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, indicator_icon_btn_cb, params), efl_pack_end(box, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "None"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, indicator_none_btn_cb, params), efl_pack_end(box, efl_added)); } @@ -810,13 +810,13 @@ test_ui_spotlight_stack(void *data EINA_UNUSED, efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Prev"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight), + EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight), efl_content_set(efl_part(layout, "prev_btn"), efl_added)); efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Next"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight), + EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight), efl_content_set(efl_part(layout, "next_btn"), efl_added)); params = calloc(1, sizeof(Params)); @@ -910,13 +910,13 @@ test_ui_spotlight_plain(void *data EINA_UNUSED, efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Prev"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight), + EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight), efl_content_set(efl_part(layout, "prev_btn"), efl_added)); efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Next"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight), + EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight), efl_content_set(efl_part(layout, "next_btn"), efl_added)); params = calloc(1, sizeof(Params)); @@ -1011,13 +1011,13 @@ test_ui_spotlight_scroll(void *data EINA_UNUSED, efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Prev"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight), + EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight), efl_content_set(efl_part(layout, "prev_btn"), efl_added)); efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Next"), efl_event_callback_add(efl_added, - EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight), + EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight), efl_content_set(efl_part(layout, "next_btn"), efl_added)); params = calloc(1, sizeof(Params)); diff --git a/src/bin/elementary/test_ui_stack.c b/src/bin/elementary/test_ui_stack.c index bd1c475959..854696b21c 100644 --- a/src/bin/elementary/test_ui_stack.c +++ b/src/bin/elementary/test_ui_stack.c @@ -70,7 +70,7 @@ _bar_left_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data) efl_text_set(left_btn, "Prev"); efl_content_set(efl_part(bn, "left_content"), left_btn); - efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data); + efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data); //Positions of "left_content" and "back_button" are the same. efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE); @@ -85,7 +85,7 @@ _bar_right_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data) efl_text_set(right_btn, "Next"); efl_content_set(efl_part(bn, "right_content"), right_btn); - efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data); + efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data); } static void @@ -95,7 +95,7 @@ _fifth_layout_insert(void *data, const Efl_Event *ev EINA_UNUSED) Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); efl_text_set(btn, "Press to remove top layout"); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_remove, stack); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_remove, stack); Eo *nl = _navigation_layout_create(stack, "5th layout", btn); @@ -109,7 +109,7 @@ _third_layout_push(void *data, const Efl_Event *ev EINA_UNUSED) Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); efl_text_set(btn, "Press to pop"); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_pop, stack); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_pop, stack); Eo *nl = _navigation_layout_create(stack, "3rd layout", btn); @@ -125,7 +125,7 @@ _second_layout_push(void *data, const Efl_Event *ev EINA_UNUSED) Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); efl_text_set(btn, "Press to double push"); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_double_push, stack); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_double_push, stack); Eo *nl = _navigation_layout_create(stack, "2nd layout", btn); @@ -139,7 +139,7 @@ _first_layout_push(Eo *win, Eo *stack) { Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); efl_text_set(btn, "Press to delete stack"); - efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_del, stack); + efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_del, stack); Eo *nl = _navigation_layout_create(stack, "1st layout", btn); diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c index ab0559276e..c7180a555e 100644 --- a/src/bin/elementary/test_ui_tab_pager.c +++ b/src/bin/elementary/test_ui_tab_pager.c @@ -222,7 +222,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), @@ -238,7 +238,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Current Tab Page Set"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tab_set_btn_cb, tsd), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tab_set_btn_cb, tsd), efl_event_callback_add(efl_added, EFL_EVENT_DEL, _tab_set_btn_del_cb, tsd), efl_pack_end(box, efl_added)); } @@ -327,7 +327,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), @@ -336,25 +336,25 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) /* Pack Begin */ btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Begin"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager), efl_pack_end(box, efl_added)); /* Pack End */ btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack End"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_end_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_end_btn_cb, tab_pager), efl_pack_end(box, efl_added)); /* Pack Before */ btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack Before Current Tab Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_before_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_before_btn_cb, tab_pager), efl_pack_end(box, efl_added)); /* Pack After */ btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Pack After Current Tab Page"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_after_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_after_btn_cb, tab_pager), efl_pack_end(box, efl_added)); in_box = efl_add(EFL_UI_BOX_CLASS, box, @@ -373,7 +373,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) /* Pack At */ btn = efl_add(EFL_UI_BUTTON_CLASS, in_box, efl_text_set(efl_added, "Pack At"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_at_btn_cb, tsd), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_at_btn_cb, tsd), efl_event_callback_add(efl_added, EFL_EVENT_DEL, _pack_at_btn_del_cb, tsd), efl_pack_end(in_box, efl_added)); } @@ -431,7 +431,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), @@ -440,20 +440,20 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) /* Clear */ btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Clear"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clear_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clear_btn_cb, tab_pager), efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented efl_pack_end(box, efl_added)); /* Unpack */ btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Unpack"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_btn_cb, tab_pager), efl_pack_end(box, efl_added)); /* Unpack All */ btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Unpack All"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager), efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented efl_pack_end(box, efl_added)); @@ -473,7 +473,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) /* Unpack At */ btn = efl_add(EFL_UI_BUTTON_CLASS, in_box, efl_text_set(efl_added, "Unpack At"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_at_btn_cb, tsd), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_at_btn_cb, tsd), efl_event_callback_add(efl_added, EFL_EVENT_DEL, _unpack_at_btn_del_cb, tsd), efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented efl_pack_end(in_box, efl_added)); @@ -526,7 +526,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), @@ -548,7 +548,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Change"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _change_btn_cb, tcd), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _change_btn_cb, tcd), efl_event_callback_add(efl_added, EFL_EVENT_DEL, _change_btn_del_cb, tcd), efl_pack_end(box, efl_added)); } @@ -586,7 +586,7 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, navi, efl_text_set(efl_added, "Back"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi)); box = efl_add(EFL_UI_BOX_CLASS, navi, efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), @@ -594,15 +594,15 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Scroll"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager), efl_pack_end(box, efl_added)); btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Stack"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager), efl_pack_end(box, efl_added)); btn = efl_add(EFL_UI_BUTTON_CLASS, box, efl_text_set(efl_added, "Unset"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager), efl_pack_end(box, efl_added)); } diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c index 34991f6634..437c9bed2d 100644 --- a/src/bin/elementary/test_ui_table.c +++ b/src/bin/elementary/test_ui_table.c @@ -543,7 +543,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED) efl_text_set(o, btn_text("appended")); efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL); elm_object_tooltip_text_set(o, "Click to unpack"); efl_pack(table, o); efl_gfx_entity_visible_set(o, 1); @@ -597,7 +597,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, o = elm_button_add(win); elm_object_content_set(o, ico); elm_object_text_set(o, "Append"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, append_cb, table); efl_pack(hbox, o); efl_gfx_entity_visible_set(o, 1); @@ -606,7 +606,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, o = elm_button_add(win); elm_object_content_set(o, ico); elm_object_text_set(o, "Clear"); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, clear_cb, table); efl_pack(hbox, o); efl_gfx_entity_visible_set(o, 1); @@ -657,7 +657,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, efl_text_set(o, btn_text(NULL)); efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL); efl_pack(table, o); efl_gfx_entity_visible_set(o, 1); @@ -665,7 +665,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, efl_text_set(o, btn_text(NULL)); efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL); efl_pack(table, o); efl_gfx_entity_visible_set(o, 1); @@ -673,7 +673,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, efl_text_set(o, btn_text(NULL)); efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); - efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); + efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL); efl_pack(table, o); efl_gfx_entity_visible_set(o, 1); diff --git a/src/bin/elementary/test_ui_table_static.c b/src/bin/elementary/test_ui_table_static.c index d21d6b6c7d..3e5ff789c4 100644 --- a/src/bin/elementary/test_ui_table_static.c +++ b/src/bin/elementary/test_ui_table_static.c @@ -133,7 +133,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void bt = elm_button_add(win); elm_object_text_set(bt, "Next API function"); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _api_bt_clicked, api); efl_pack_table(table, bt, 30, 0, 40, 10); elm_object_disabled_set(bt, api->state == API_STATE_LAST); efl_gfx_entity_visible_set(bt, 1); @@ -162,7 +162,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void bt = elm_button_add(win); elm_object_text_set(bt, "Change"); efl_pack_table(table, bt, 40, 40, 20, 20); - efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table); + efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _ch_table, table); efl_gfx_entity_visible_set(bt, 1); rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); diff --git a/src/bin/elementary/test_ui_tags.c b/src/bin/elementary/test_ui_tags.c index 2ef7d6db2b..475bc68837 100644 --- a/src/bin/elementary/test_ui_tags.c +++ b/src/bin/elementary/test_ui_tags.c @@ -83,7 +83,7 @@ test_ui_tags(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i efl_add(EFL_UI_BUTTON_CLASS, layout, efl_text_set(efl_added, "Change mode"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, tags), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, tags), elm_object_part_content_set(layout, "box", efl_added)); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 480)); diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c index 0ebb30bf0f..aa9606f316 100644 --- a/src/bin/elementary/test_win_indicator.c +++ b/src/bin/elementary/test_win_indicator.c @@ -106,18 +106,18 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Indicator Off"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _off_clicked, win), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _off_clicked, win), efl_pack(bx, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Bg Opaque"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _opaque_clicked, win), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _opaque_clicked, win), efl_pack(bx, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Bg Transparent"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _transparent_clicked, win), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _transparent_clicked, win), efl_pack(bx, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Hidden"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _hidden_clicked, win), + efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _hidden_clicked, win), efl_pack(bx, efl_added)); } |