summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2019-07-29 11:42:34 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-07-29 11:43:01 +0200
commit77e268e6aba2d07b9d4b06c83515041775210c27 (patch)
treef50da1eada65a948147a62ede0cc815e66105784 /src/bin
parent9b294d6284fbda62dde20bcb31732a1c63a65962 (diff)
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')
-rw-r--r--src/bin/elementary/test_bg.c4
-rw-r--r--src/bin/elementary/test_efl_ui_text.c10
-rw-r--r--src/bin/elementary/test_evas_mask.c6
-rw-r--r--src/bin/elementary/test_evas_snapshot.c8
-rw-r--r--src/bin/elementary/test_events.c4
-rw-r--r--src/bin/elementary/test_gfx_filters.c4
-rw-r--r--src/bin/elementary/test_part_bg.c6
-rw-r--r--src/bin/elementary/test_part_shadow.c4
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/bin/elementary/test_ui_button.c18
-rw-r--r--src/bin/elementary/test_ui_clock.c2
-rw-r--r--src/bin/elementary/test_ui_image.c4
-rw-r--r--src/bin/elementary/test_ui_item_container.c12
-rw-r--r--src/bin/elementary/test_ui_pager.c32
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c40
-rw-r--r--src/bin/elementary/test_ui_panel.c2
-rw-r--r--src/bin/elementary/test_ui_popup.c82
-rw-r--r--src/bin/elementary/test_ui_progressbar.c6
-rw-r--r--src/bin/elementary/test_ui_radio.c6
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c4
-rw-r--r--src/bin/elementary/test_ui_scroller.c16
-rw-r--r--src/bin/elementary/test_ui_spin.c4
-rw-r--r--src/bin/elementary/test_ui_spotlight.c44
-rw-r--r--src/bin/elementary/test_ui_stack.c12
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c38
-rw-r--r--src/bin/elementary/test_ui_table.c12
-rw-r--r--src/bin/elementary/test_ui_table_static.c4
-rw-r--r--src/bin/elementary/test_ui_tags.c2
-rw-r--r--src/bin/elementary/test_win_indicator.c8
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
358 efl_file_set(efl_added, buf), 358 efl_file_set(efl_added, buf),
359 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), 359 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
360 efl_gfx_hint_align_set(efl_added, 0.5, 0.5), 360 efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
361 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win), 361 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _file_cb, win),
362 efl_pack(box, efl_added)); 362 efl_pack(box, efl_added));
363 363
364 snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); 364 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
366 efl_file_set(efl_added, buf), 366 efl_file_set(efl_added, buf),
367 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), 367 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
368 efl_gfx_hint_align_set(efl_added, 0.5, 0.5), 368 efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
369 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), 369 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _image_cb, win),
370 efl_pack(box, efl_added)); 370 efl_pack(box, efl_added));
371 371
372 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200)); 372 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
184 184
185 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 185 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
186 efl_text_set(bt, "Sel"); 186 efl_text_set(bt, "Sel");
187 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en); 187 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt3_clicked, en);
188 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); 188 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
189 efl_pack(bx2, bt); 189 efl_pack(bx2, bt);
190 elm_object_focus_allow_set(bt, EINA_FALSE); 190 elm_object_focus_allow_set(bt, EINA_FALSE);
191 191
192 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 192 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
193 efl_text_set(bt, "Wr"); 193 efl_text_set(bt, "Wr");
194 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en); 194 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt6_clicked, en);
195 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); 195 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
196 efl_pack(bx2, bt); 196 efl_pack(bx2, bt);
197 elm_object_focus_allow_set(bt, EINA_FALSE); 197 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,
376 376
377 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 377 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
378 efl_text_set(bt, "Image"); 378 efl_text_set(bt, "Image");
379 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en); 379 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_image_clicked, en);
380 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); 380 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
381 efl_pack(bx2, bt); 381 efl_pack(bx2, bt);
382 elm_object_focus_allow_set(bt, EINA_FALSE); 382 elm_object_focus_allow_set(bt, EINA_FALSE);
383 383
384 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 384 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
385 efl_text_set(bt, "Emoticon"); 385 efl_text_set(bt, "Emoticon");
386 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en); 386 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en);
387 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); 387 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
388 efl_pack(bx2, bt); 388 efl_pack(bx2, bt);
389 elm_object_focus_allow_set(bt, EINA_FALSE); 389 elm_object_focus_allow_set(bt, EINA_FALSE);
390 390
391 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 391 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
392 efl_text_set(bt, "Factory"); 392 efl_text_set(bt, "Factory");
393 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en); 393 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_factory_clicked, en);
394 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); 394 efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
395 efl_pack(bx2, bt); 395 efl_pack(bx2, bt);
396 elm_object_focus_allow_set(bt, EINA_FALSE); 396 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
182 // FIXME: button EO API 182 // FIXME: button EO API
183 efl_add(EFL_UI_BUTTON_CLASS, win, 183 efl_add(EFL_UI_BUTTON_CLASS, win,
184 efl_text_set(efl_added, "Toggle mask (image)"), 184 efl_text_set(efl_added, "Toggle mask (image)"),
185 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), 185 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_mask, ly),
186 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 186 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
187 efl_pack(box2, efl_added)); 187 efl_pack(box2, efl_added));
188 188
189 efl_add(EFL_UI_BUTTON_CLASS, win, 189 efl_add(EFL_UI_BUTTON_CLASS, win,
190 efl_text_set(efl_added, "Toggle map"), 190 efl_text_set(efl_added, "Toggle map"),
191 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), 191 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, ly),
192 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 192 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
193 efl_pack(box2, efl_added)); 193 efl_pack(box2, efl_added));
194 194
195 efl_add(EFL_UI_BUTTON_CLASS, win, 195 efl_add(EFL_UI_BUTTON_CLASS, win,
196 efl_text_set(efl_added, "Rotate Window"), 196 efl_text_set(efl_added, "Rotate Window"),
197 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), 197 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _rotate_win, win),
198 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 198 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
199 efl_pack(box2, efl_added)); 199 efl_pack(box2, efl_added));
200 200
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
184 efl_text_set(efl_added, "Toggle animation"), 184 efl_text_set(efl_added, "Toggle animation"),
185 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 185 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
186 efl_pack(box, efl_added), 186 efl_pack(box, efl_added),
187 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win)); 187 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _anim_toggle, win));
188 188
189 efl_add(EFL_UI_BUTTON_CLASS, win, 189 efl_add(EFL_UI_BUTTON_CLASS, win,
190 efl_text_set(efl_added, "Save to file"), 190 efl_text_set(efl_added, "Save to file"),
191 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 191 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
192 efl_pack(box, efl_added), 192 efl_pack(box, efl_added),
193 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win)); 193 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _save_image, win));
194 194
195 efl_add(EFL_UI_BUTTON_CLASS, win, 195 efl_add(EFL_UI_BUTTON_CLASS, win,
196 efl_text_set(efl_added, "Map"), 196 efl_text_set(efl_added, "Map"),
197 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 197 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
198 efl_pack(box, efl_added), 198 efl_pack(box, efl_added),
199 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win)); 199 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, win));
200 200
201 efl_add(EFL_UI_BUTTON_CLASS, win, 201 efl_add(EFL_UI_BUTTON_CLASS, win,
202 efl_text_set(efl_added, "Close"), 202 efl_text_set(efl_added, "Close"),
203 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 203 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
204 efl_pack(box, efl_added), 204 efl_pack(box, efl_added),
205 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win)); 205 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _close_do, win));
206 206
207 efl_key_wref_set(win, "snap", snap); 207 efl_key_wref_set(win, "snap", snap);
208 efl_key_wref_set(win, "table", table); 208 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
227 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); 227 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
228 efl_pack(bx, o); 228 efl_pack(bx, o);
229 229
230 efl_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td); 230 efl_event_callback_add(td->button, EFL_INPUT_EVENT_CLICKED, _clicked_button1, td);
231 efl_event_callback_array_add(td->button, button_pointer_callbacks(), (void*)(intptr_t)0x1); 231 efl_event_callback_array_add(td->button, button_pointer_callbacks(), (void*)(intptr_t)0x1);
232 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td); 232 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _clicked_button2, td);
233 efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, td); 233 efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, td);
234 efl_event_callback_array_add(o, rect_pointer_callbacks(), td); 234 efl_event_callback_array_add(o, rect_pointer_callbacks(), td);
235 efl_event_callback_array_add(win, win_key_callbacks(), td); 235 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
378 efl_text_set(efl_added, "Flip"), 378 efl_text_set(efl_added, "Flip"),
379 efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), 379 efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
380 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 380 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
381 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win)); 381 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _flip_click, win));
382 efl_pack(box2, o); 382 efl_pack(box2, o);
383 } 383 }
384 384
@@ -409,7 +409,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
409 elm_object_tooltip_text_set(efl_added, images[k].src_name)); 409 elm_object_tooltip_text_set(efl_added, images[k].src_name));
410 if (efl_player_playable_get(o)) 410 if (efl_player_playable_get(o))
411 efl_player_play_set(o, 1); 411 efl_player_play_set(o, 1);
412 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _img_click, win); 412 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _img_click, win);
413 efl_pack(box2, o); 413 efl_pack(box2, o);
414 } 414 }
415 415
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
181 181
182 radio_group = _create_box_contents(vbox); 182 radio_group = _create_box_contents(vbox);
183 183
184 efl_event_callback_add(reset_btn, EFL_UI_EVENT_CLICKED, _reset_cb, radio_group); 184 efl_event_callback_add(reset_btn, EFL_INPUT_EVENT_CLICKED, _reset_cb, radio_group);
185 efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group); 185 efl_event_callback_add(color_btn, EFL_INPUT_EVENT_CLICKED, _color_cb, radio_group);
186 efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group); 186 efl_event_callback_add(scale_btn, EFL_INPUT_EVENT_CLICKED, _scale_type_cb, radio_group);
187 187
188 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200)); 188 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
189} 189}
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
181 efl_pack(bx, bt_bx); 181 efl_pack(bx, bt_bx);
182 182
183 bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start")); 183 bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start"));
184 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_start, td); 184 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_start, td);
185 efl_pack(bt_bx, bt); 185 efl_pack(bt_bx, bt);
186 td->btn_start = bt; 186 td->btn_start = bt;
187 187
188 bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Stop")); 188 bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Stop"));
189 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_stop, td); 189 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_stop, td);
190 efl_ui_widget_disabled_set(bt, EINA_TRUE); 190 efl_ui_widget_disabled_set(bt, EINA_TRUE);
191 efl_pack(bt_bx, bt); 191 efl_pack(bt_bx, bt);
192 td->btn_stop = bt; 192 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
827 efl_file_set(efl_added, buf), 827 efl_file_set(efl_added, buf),
828 efl_file_load(efl_added), 828 efl_file_load(efl_added),
829 efl_pack(bx, efl_added), 829 efl_pack(bx, efl_added),
830 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _zoomable_clicked_cb, NULL) 830 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
831 ); 831 );
832 832
833 if (efl_player_playable_get(zoomable)) 833 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
42 efl_add(EFL_UI_BUTTON_CLASS, bx, 42 efl_add(EFL_UI_BUTTON_CLASS, bx,
43 efl_text_set(efl_added, "Text"), 43 efl_text_set(efl_added, "Text"),
44 efl_pack(bx, efl_added), 44 efl_pack(bx, efl_added),
45 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), 45 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
46 efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), 46 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
47 efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL) 47 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
48 ); 48 );
49 49
50 // Icon Only Button 50 // Icon Only Button
51 snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); 51 snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
52 btn = efl_add(EFL_UI_BUTTON_CLASS, bx, 52 btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
53 efl_pack(bx, efl_added), 53 efl_pack(bx, efl_added),
54 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), 54 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
55 efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), 55 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
56 efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL) 56 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
57 ); 57 );
58 efl_add(EFL_UI_IMAGE_CLASS, btn, 58 efl_add(EFL_UI_IMAGE_CLASS, btn,
59 efl_file_set(efl_added, buf), 59 efl_file_set(efl_added, buf),
@@ -65,9 +65,9 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
65 btn = efl_add(EFL_UI_BUTTON_CLASS, bx, 65 btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
66 efl_text_set(efl_added, "Text + Icon"), 66 efl_text_set(efl_added, "Text + Icon"),
67 efl_pack(bx, efl_added), 67 efl_pack(bx, efl_added),
68 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), 68 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
69 efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), 69 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
70 efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL) 70 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
71 ); 71 );
72 efl_add(EFL_UI_IMAGE_CLASS, btn, 72 efl_add(EFL_UI_IMAGE_CLASS, btn,
73 efl_file_set(efl_added, buf), 73 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_
102 102
103 efl_add(EFL_UI_BUTTON_CLASS, win, 103 efl_add(EFL_UI_BUTTON_CLASS, win,
104 efl_text_set(efl_added, "Back to the future..."), 104 efl_text_set(efl_added, "Back to the future..."),
105 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 105 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
106 efl_pack(bx, efl_added)); 106 efl_pack(bx, efl_added));
107} 107}
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
573 { 573 {
574 bt = efl_add(EFL_UI_BUTTON_CLASS, win, 574 bt = efl_add(EFL_UI_BUTTON_CLASS, win,
575 efl_text_set(efl_added, "Image Reload"), 575 efl_text_set(efl_added, "Image Reload"),
576 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _reload_clicked, win) 576 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _reload_clicked, win)
577 ); 577 );
578 efl_pack(hbox, bt); 578 efl_pack(hbox, bt);
579 579
580 bt = efl_add(EFL_UI_BUTTON_CLASS, win, 580 bt = efl_add(EFL_UI_BUTTON_CLASS, win,
581 efl_text_set(efl_added, "Image Switch"), 581 efl_text_set(efl_added, "Image Switch"),
582 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _switch_clicked, win) 582 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _switch_clicked, win)
583 ); 583 );
584 efl_pack(hbox, bt); 584 efl_pack(hbox, bt);
585 } 585 }
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
175 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 175 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
176 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 176 efl_gfx_hint_align_set(efl_added, 0, 0.5));
177 efl_text_set(o, "Scroll to 1154 ANIMATED"); 177 efl_text_set(o, "Scroll to 1154 ANIMATED");
178 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_animated_cb, item_container); 178 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_animated_cb, item_container);
179 efl_pack_table(tbl, o, 0, 1, 1, 1); 179 efl_pack_table(tbl, o, 0, 1, 1, 1);
180 180
181 o = efl_add(EFL_UI_BUTTON_CLASS, tbl, 181 o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
182 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 182 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
183 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 183 efl_gfx_hint_align_set(efl_added, 0, 0.5));
184 efl_text_set(o, "Scroll to 10"); 184 efl_text_set(o, "Scroll to 10");
185 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_cb, item_container); 185 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_cb, item_container);
186 efl_pack_table(tbl, o, 0, 2, 1, 1); 186 efl_pack_table(tbl, o, 0, 2, 1, 1);
187 187
188 o = efl_add(EFL_UI_BUTTON_CLASS, tbl, 188 o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
189 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 189 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
190 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 190 efl_gfx_hint_align_set(efl_added, 0, 0.5));
191 efl_text_set(o, "Change min size of 0"); 191 efl_text_set(o, "Change min size of 0");
192 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _change_min_size_cb, item_container); 192 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _change_min_size_cb, item_container);
193 efl_pack_table(tbl, o, 0, 3, 1, 1); 193 efl_pack_table(tbl, o, 0, 3, 1, 1);
194 194
195 o = efl_add(EFL_UI_CHECK_CLASS, tbl, 195 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
221 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 221 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
222 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 222 efl_gfx_hint_align_set(efl_added, 0, 0.5));
223 efl_text_set(o, "Remove all items"); 223 efl_text_set(o, "Remove all items");
224 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _remove_all_cb, item_container); 224 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _remove_all_cb, item_container);
225 efl_pack_table(tbl, o, 0, 7, 1, 1); 225 efl_pack_table(tbl, o, 0, 7, 1, 1);
226 226
227 o = efl_add(EFL_UI_BUTTON_CLASS, tbl, 227 o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
228 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 228 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
229 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 229 efl_gfx_hint_align_set(efl_added, 0, 0.5));
230 efl_text_set(o, "Add 1 item"); 230 efl_text_set(o, "Add 1 item");
231 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_one_item, item_container); 231 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_one_item, item_container);
232 efl_pack_table(tbl, o, 0, 8, 1, 1); 232 efl_pack_table(tbl, o, 0, 8, 1, 1);
233 233
234 o = efl_add(EFL_UI_BUTTON_CLASS, tbl, 234 o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
235 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 235 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
236 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 236 efl_gfx_hint_align_set(efl_added, 0, 0.5));
237 efl_text_set(o, "Add 1000 item"); 237 efl_text_set(o, "Add 1000 item");
238 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_thousend_items, item_container); 238 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_thousend_items, item_container);
239 efl_pack_table(tbl, o, 0, 9, 1, 1); 239 efl_pack_table(tbl, o, 0, 9, 1, 1);
240 240
241 bx = efl_add(EFL_UI_RADIO_BOX_CLASS, tbl, 241 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,
337 337
338 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 338 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
339 efl_text_set(efl_added, "Back"), 339 efl_text_set(efl_added, "Back"),
340 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 340 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
341 back_btn_cb, navi)); 341 back_btn_cb, navi));
342 342
343 box = efl_add(EFL_UI_BOX_CLASS, navi, 343 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -439,7 +439,7 @@ static void pack_cb(void *data,
439 439
440 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 440 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
441 efl_text_set(efl_added, "Back"), 441 efl_text_set(efl_added, "Back"),
442 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 442 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
443 back_btn_cb, navi)); 443 back_btn_cb, navi));
444 444
445 box = efl_add(EFL_UI_BOX_CLASS, navi, 445 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -478,7 +478,7 @@ static void pack_cb(void *data,
478 478
479 efl_add(EFL_UI_BUTTON_CLASS, box, 479 efl_add(EFL_UI_BUTTON_CLASS, box,
480 efl_text_set(efl_added, "Pack Begin"), 480 efl_text_set(efl_added, "Pack Begin"),
481 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 481 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
482 pack_btn_cb, pack_param), 482 pack_btn_cb, pack_param),
483 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 483 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
484 pack_btn_del_cb, pack_param), 484 pack_btn_del_cb, pack_param),
@@ -496,7 +496,7 @@ static void pack_cb(void *data,
496 496
497 efl_add(EFL_UI_BUTTON_CLASS, box, 497 efl_add(EFL_UI_BUTTON_CLASS, box,
498 efl_text_set(efl_added, "Pack End"), 498 efl_text_set(efl_added, "Pack End"),
499 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 499 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
500 pack_btn_cb, pack_param), 500 pack_btn_cb, pack_param),
501 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 501 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
502 pack_btn_del_cb, pack_param), 502 pack_btn_del_cb, pack_param),
@@ -514,7 +514,7 @@ static void pack_cb(void *data,
514 514
515 efl_add(EFL_UI_BUTTON_CLASS, box, 515 efl_add(EFL_UI_BUTTON_CLASS, box,
516 efl_text_set(efl_added, "Pack Before Current Page"), 516 efl_text_set(efl_added, "Pack Before Current Page"),
517 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 517 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
518 pack_btn_cb, pack_param), 518 pack_btn_cb, pack_param),
519 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 519 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
520 pack_btn_del_cb, pack_param), 520 pack_btn_del_cb, pack_param),
@@ -532,7 +532,7 @@ static void pack_cb(void *data,
532 532
533 efl_add(EFL_UI_BUTTON_CLASS, box, 533 efl_add(EFL_UI_BUTTON_CLASS, box,
534 efl_text_set(efl_added, "Pack After Current Page"), 534 efl_text_set(efl_added, "Pack After Current Page"),
535 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 535 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
536 pack_btn_cb, pack_param), 536 pack_btn_cb, pack_param),
537 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 537 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
538 pack_btn_del_cb, pack_param), 538 pack_btn_del_cb, pack_param),
@@ -550,7 +550,7 @@ static void pack_cb(void *data,
550 550
551 efl_add(EFL_UI_BUTTON_CLASS, in_box1, 551 efl_add(EFL_UI_BUTTON_CLASS, in_box1,
552 efl_text_set(efl_added, "Pack At"), 552 efl_text_set(efl_added, "Pack At"),
553 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 553 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
554 pack_btn_cb, pack_param), 554 pack_btn_cb, pack_param),
555 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 555 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
556 pack_btn_del_cb, pack_param), 556 pack_btn_del_cb, pack_param),
@@ -569,7 +569,7 @@ static void pack_cb(void *data,
569 pack_param->unpack_btn = btn; 569 pack_param->unpack_btn = btn;
570 pack_param->type = UNPACK_AT; 570 pack_param->type = UNPACK_AT;
571 571
572 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, 572 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
573 pack_btn_cb, pack_param); 573 pack_btn_cb, pack_param);
574 efl_event_callback_add(btn, EFL_EVENT_DEL, 574 efl_event_callback_add(btn, EFL_EVENT_DEL,
575 pack_btn_del_cb, pack_param); 575 pack_btn_del_cb, pack_param);
@@ -603,7 +603,7 @@ static void pack_cb(void *data,
603 603
604 efl_add(EFL_UI_BUTTON_CLASS, box, 604 efl_add(EFL_UI_BUTTON_CLASS, box,
605 efl_text_set(efl_added, "Clear"), 605 efl_text_set(efl_added, "Clear"),
606 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 606 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
607 pack_btn_cb, pack_param), 607 pack_btn_cb, pack_param),
608 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 608 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
609 pack_btn_del_cb, pack_param), 609 pack_btn_del_cb, pack_param),
@@ -624,7 +624,7 @@ static void current_page_cb(void *data,
624 624
625 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 625 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
626 efl_text_set(efl_added, "Back"), 626 efl_text_set(efl_added, "Back"),
627 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 627 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
628 back_btn_cb, navi)); 628 back_btn_cb, navi));
629 629
630 box = efl_add(EFL_UI_BOX_CLASS, navi, 630 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -656,7 +656,7 @@ static void current_page_cb(void *data,
656 psp->pager = pager; 656 psp->pager = pager;
657 psp->spinner = sp; 657 psp->spinner = sp;
658 658
659 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp); 659 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
660 efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp); 660 efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
661} 661}
662 662
@@ -670,7 +670,7 @@ static void indicator_cb(void *data,
670 670
671 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 671 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
672 efl_text_set(efl_added, "Back"), 672 efl_text_set(efl_added, "Back"),
673 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 673 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
674 back_btn_cb, navi)); 674 back_btn_cb, navi));
675 675
676 box = efl_add(EFL_UI_BOX_CLASS, navi, 676 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -680,13 +680,13 @@ static void indicator_cb(void *data,
680 680
681 efl_add(EFL_UI_BUTTON_CLASS, box, 681 efl_add(EFL_UI_BUTTON_CLASS, box,
682 efl_text_set(efl_added, "Icon Type"), 682 efl_text_set(efl_added, "Icon Type"),
683 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 683 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
684 indicator_icon_btn_cb, params), 684 indicator_icon_btn_cb, params),
685 efl_pack_end(box, efl_added)); 685 efl_pack_end(box, efl_added));
686 686
687 efl_add(EFL_UI_BUTTON_CLASS, box, 687 efl_add(EFL_UI_BUTTON_CLASS, box,
688 efl_text_set(efl_added, "None"), 688 efl_text_set(efl_added, "None"),
689 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 689 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
690 indicator_none_btn_cb, params), 690 indicator_none_btn_cb, params),
691 efl_pack_end(box, efl_added)); 691 efl_pack_end(box, efl_added));
692} 692}
@@ -735,13 +735,13 @@ void test_ui_pager(void *data EINA_UNUSED,
735 efl_add(EFL_UI_BUTTON_CLASS, layout, 735 efl_add(EFL_UI_BUTTON_CLASS, layout,
736 efl_text_set(efl_added, "Prev"), 736 efl_text_set(efl_added, "Prev"),
737 efl_event_callback_add(efl_added, 737 efl_event_callback_add(efl_added,
738 EFL_UI_EVENT_CLICKED, prev_btn_cb, pager), 738 EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager),
739 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 739 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
740 740
741 efl_add(EFL_UI_BUTTON_CLASS, layout, 741 efl_add(EFL_UI_BUTTON_CLASS, layout,
742 efl_text_set(efl_added, "Next"), 742 efl_text_set(efl_added, "Next"),
743 efl_event_callback_add(efl_added, 743 efl_event_callback_add(efl_added,
744 EFL_UI_EVENT_CLICKED, next_btn_cb, pager), 744 EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager),
745 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 745 efl_content_set(efl_part(layout, "next_btn"), efl_added));
746 746
747 params = calloc(1, sizeof(Params)); 747 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,
391 391
392 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 392 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
393 efl_text_set(efl_added, "Back"), 393 efl_text_set(efl_added, "Back"),
394 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 394 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
395 back_btn_cb, navi)); 395 back_btn_cb, navi));
396 396
397 box = efl_add(EFL_UI_BOX_CLASS, navi, 397 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -491,7 +491,7 @@ static void padding_cb(void *data,
491 491
492 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 492 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
493 efl_text_set(efl_added, "Back"), 493 efl_text_set(efl_added, "Back"),
494 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 494 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
495 back_btn_cb, navi)); 495 back_btn_cb, navi));
496 496
497 box = efl_add(EFL_UI_BOX_CLASS, navi, 497 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -518,7 +518,7 @@ static void side_page_num_cb(void *data,
518 518
519 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 519 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
520 efl_text_set(efl_added, "Back"), 520 efl_text_set(efl_added, "Back"),
521 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 521 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
522 back_btn_cb, navi)); 522 back_btn_cb, navi));
523 523
524 box = efl_add(EFL_UI_BOX_CLASS, navi, 524 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -551,7 +551,7 @@ static void pack_cb(void *data,
551 551
552 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 552 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
553 efl_text_set(efl_added, "Back"), 553 efl_text_set(efl_added, "Back"),
554 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 554 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
555 back_btn_cb, navi)); 555 back_btn_cb, navi));
556 556
557 box = efl_add(EFL_UI_BOX_CLASS, navi, 557 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -590,7 +590,7 @@ static void pack_cb(void *data,
590 590
591 efl_add(EFL_UI_BUTTON_CLASS, box, 591 efl_add(EFL_UI_BUTTON_CLASS, box,
592 efl_text_set(efl_added, "Pack Begin"), 592 efl_text_set(efl_added, "Pack Begin"),
593 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 593 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
594 pack_btn_cb, pack_param), 594 pack_btn_cb, pack_param),
595 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 595 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
596 pack_btn_del_cb, pack_param), 596 pack_btn_del_cb, pack_param),
@@ -608,7 +608,7 @@ static void pack_cb(void *data,
608 608
609 efl_add(EFL_UI_BUTTON_CLASS, box, 609 efl_add(EFL_UI_BUTTON_CLASS, box,
610 efl_text_set(efl_added, "Pack End"), 610 efl_text_set(efl_added, "Pack End"),
611 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 611 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
612 pack_btn_cb, pack_param), 612 pack_btn_cb, pack_param),
613 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 613 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
614 pack_btn_del_cb, pack_param), 614 pack_btn_del_cb, pack_param),
@@ -626,7 +626,7 @@ static void pack_cb(void *data,
626 626
627 efl_add(EFL_UI_BUTTON_CLASS, box, 627 efl_add(EFL_UI_BUTTON_CLASS, box,
628 efl_text_set(efl_added, "Pack Before Current Page"), 628 efl_text_set(efl_added, "Pack Before Current Page"),
629 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 629 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
630 pack_btn_cb, pack_param), 630 pack_btn_cb, pack_param),
631 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 631 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
632 pack_btn_del_cb, pack_param), 632 pack_btn_del_cb, pack_param),
@@ -644,7 +644,7 @@ static void pack_cb(void *data,
644 644
645 efl_add(EFL_UI_BUTTON_CLASS, box, 645 efl_add(EFL_UI_BUTTON_CLASS, box,
646 efl_text_set(efl_added, "Pack After Current Page"), 646 efl_text_set(efl_added, "Pack After Current Page"),
647 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 647 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
648 pack_btn_cb, pack_param), 648 pack_btn_cb, pack_param),
649 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 649 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
650 pack_btn_del_cb, pack_param), 650 pack_btn_del_cb, pack_param),
@@ -662,7 +662,7 @@ static void pack_cb(void *data,
662 662
663 efl_add(EFL_UI_BUTTON_CLASS, in_box1, 663 efl_add(EFL_UI_BUTTON_CLASS, in_box1,
664 efl_text_set(efl_added, "Pack At"), 664 efl_text_set(efl_added, "Pack At"),
665 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 665 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
666 pack_btn_cb, pack_param), 666 pack_btn_cb, pack_param),
667 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 667 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
668 pack_btn_del_cb, pack_param), 668 pack_btn_del_cb, pack_param),
@@ -681,7 +681,7 @@ static void pack_cb(void *data,
681 pack_param->unpack_btn = btn; 681 pack_param->unpack_btn = btn;
682 pack_param->type = UNPACK_AT; 682 pack_param->type = UNPACK_AT;
683 683
684 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, 684 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
685 pack_btn_cb, pack_param); 685 pack_btn_cb, pack_param);
686 efl_event_callback_add(btn, EFL_EVENT_DEL, 686 efl_event_callback_add(btn, EFL_EVENT_DEL,
687 pack_btn_del_cb, pack_param); 687 pack_btn_del_cb, pack_param);
@@ -715,7 +715,7 @@ static void pack_cb(void *data,
715 715
716 efl_add(EFL_UI_BUTTON_CLASS, box, 716 efl_add(EFL_UI_BUTTON_CLASS, box,
717 efl_text_set(efl_added, "Clear"), 717 efl_text_set(efl_added, "Clear"),
718 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 718 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
719 pack_btn_cb, pack_param), 719 pack_btn_cb, pack_param),
720 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 720 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
721 pack_btn_del_cb, pack_param), 721 pack_btn_del_cb, pack_param),
@@ -735,7 +735,7 @@ static void current_page_cb(void *data,
735 735
736 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 736 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
737 efl_text_set(efl_added, "Back"), 737 efl_text_set(efl_added, "Back"),
738 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 738 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
739 back_btn_cb, navi)); 739 back_btn_cb, navi));
740 740
741 box = efl_add(EFL_UI_BOX_CLASS, navi, 741 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -767,7 +767,7 @@ static void current_page_cb(void *data,
767 psp->pager = pager; 767 psp->pager = pager;
768 psp->spinner = sp; 768 psp->spinner = sp;
769 769
770 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp); 770 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
771 efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp); 771 efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
772} 772}
773 773
@@ -783,7 +783,7 @@ static void scroll_block_cb(void *data,
783 783
784 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 784 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
785 efl_text_set(efl_added, "Back"), 785 efl_text_set(efl_added, "Back"),
786 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 786 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
787 back_btn_cb, navi)); 787 back_btn_cb, navi));
788 788
789 box = efl_add(EFL_UI_BOX_CLASS, navi, 789 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -822,7 +822,7 @@ static void loop_cb(void *data EINA_UNUSED,
822 822
823 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 823 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
824 efl_text_set(efl_added, "Back"), 824 efl_text_set(efl_added, "Back"),
825 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 825 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
826 back_btn_cb, navi)); 826 back_btn_cb, navi));
827 827
828 box = efl_add(EFL_UI_RADIO_BOX_CLASS, navi, 828 box = efl_add(EFL_UI_RADIO_BOX_CLASS, navi,
@@ -870,7 +870,7 @@ static void indicator_cb(void *data EINA_UNUSED,
870 870
871 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 871 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
872 efl_text_set(efl_added, "Back"), 872 efl_text_set(efl_added, "Back"),
873 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 873 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
874 back_btn_cb, navi)); 874 back_btn_cb, navi));
875 875
876 box = efl_add(EFL_UI_BOX_CLASS, navi, 876 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -880,13 +880,13 @@ static void indicator_cb(void *data EINA_UNUSED,
880 880
881 efl_add(EFL_UI_BUTTON_CLASS, box, 881 efl_add(EFL_UI_BUTTON_CLASS, box,
882 efl_text_set(efl_added, "Icon Type"), 882 efl_text_set(efl_added, "Icon Type"),
883 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 883 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
884 indicator_icon_btn_cb, params), 884 indicator_icon_btn_cb, params),
885 efl_pack_end(box, efl_added)); 885 efl_pack_end(box, efl_added));
886 886
887 efl_add(EFL_UI_BUTTON_CLASS, box, 887 efl_add(EFL_UI_BUTTON_CLASS, box,
888 efl_text_set(efl_added, "None"), 888 efl_text_set(efl_added, "None"),
889 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 889 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
890 indicator_none_btn_cb, params), 890 indicator_none_btn_cb, params),
891 efl_pack_end(box, efl_added)); 891 efl_pack_end(box, efl_added));
892} 892}
@@ -936,13 +936,13 @@ void test_ui_pager_scroll(void *data EINA_UNUSED,
936 efl_add(EFL_UI_BUTTON_CLASS, layout, 936 efl_add(EFL_UI_BUTTON_CLASS, layout,
937 efl_text_set(efl_added, "Prev"), 937 efl_text_set(efl_added, "Prev"),
938 efl_event_callback_add(efl_added, 938 efl_event_callback_add(efl_added,
939 EFL_UI_EVENT_CLICKED, prev_btn_cb, pager), 939 EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager),
940 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 940 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
941 941
942 efl_add(EFL_UI_BUTTON_CLASS, layout, 942 efl_add(EFL_UI_BUTTON_CLASS, layout,
943 efl_text_set(efl_added, "Next"), 943 efl_text_set(efl_added, "Next"),
944 efl_event_callback_add(efl_added, 944 efl_event_callback_add(efl_added,
945 EFL_UI_EVENT_CLICKED, next_btn_cb, pager), 945 EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager),
946 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 946 efl_content_set(efl_part(layout, "next_btn"), efl_added));
947 947
948 tran = efl_add(EFL_PAGE_TRANSITION_SCROLL_CLASS, pager, 948 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
154 efl_content_set(panel, list); 154 efl_content_set(panel, list);
155 155
156 efl_event_callback_add(panel, EFL_UI_PANEL_EVENT_TOGGLED, _panel_toggled, check); 156 efl_event_callback_add(panel, EFL_UI_PANEL_EVENT_TOGGLED, _panel_toggled, check);
157 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _btn_clicked, panel); 157 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _btn_clicked, panel);
158 158
159 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); 159 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
160} 160}
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_
251 efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0)); 251 efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
252 efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100)); 252 efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
253 efl_text_set(repeat_test_btn, "Repeat Event Test"); 253 efl_text_set(repeat_test_btn, "Repeat Event Test");
254 efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL); 254 efl_event_callback_add(repeat_test_btn, EFL_INPUT_EVENT_CLICKED, _repeat_test_cb, NULL);
255 efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE); 255 efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE);
256 256
257 p_data->win = win; 257 p_data->win = win;
@@ -263,73 +263,73 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
263 efl_text_set(create_btn, "Create Popup"); 263 efl_text_set(create_btn, "Create Popup");
264 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0)); 264 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
265 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50)); 265 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50));
266 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data); 266 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _create_cb, p_data);
267 267
268 Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 268 Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
269 efl_text_set(delete_btn, "Delete Popup"); 269 efl_text_set(delete_btn, "Delete Popup");
270 efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0)); 270 efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0));
271 efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50)); 271 efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50));
272 efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data); 272 efl_event_callback_add(delete_btn, EFL_INPUT_EVENT_CLICKED, _delete_cb, p_data);
273 273
274 Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 274 Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
275 efl_text_set(repeat_event_btn, "Repeat Event Set"); 275 efl_text_set(repeat_event_btn, "Repeat Event Set");
276 efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50)); 276 efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50));
277 efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50)); 277 efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50));
278 efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data); 278 efl_event_callback_add(repeat_event_btn, EFL_INPUT_EVENT_CLICKED, _repeat_event_cb, p_data);
279 279
280 Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 280 Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
281 efl_text_set(dummy_btn, "Show Dummy Button"); 281 efl_text_set(dummy_btn, "Show Dummy Button");
282 efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50)); 282 efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50));
283 efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50)); 283 efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50));
284 efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data); 284 efl_event_callback_add(dummy_btn, EFL_INPUT_EVENT_CLICKED, _dummy_cb, p_data);
285 285
286 Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 286 Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
287 efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100)); 287 efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100));
288 efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50)); 288 efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50));
289 efl_text_set(backwall_btn, "Backwall Set"); 289 efl_text_set(backwall_btn, "Backwall Set");
290 efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data); 290 efl_event_callback_add(backwall_btn, EFL_INPUT_EVENT_CLICKED, _backwall_cb, p_data);
291 291
292 Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 292 Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
293 efl_text_set(timeout_btn, "Timeout Set"); 293 efl_text_set(timeout_btn, "Timeout Set");
294 efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100)); 294 efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100));
295 efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50)); 295 efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50));
296 efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data); 296 efl_event_callback_add(timeout_btn, EFL_INPUT_EVENT_CLICKED, _timeout_set_cb, p_data);
297 297
298 Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 298 Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
299 efl_text_set(center_btn, "Center Align"); 299 efl_text_set(center_btn, "Center Align");
300 efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150)); 300 efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150));
301 efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50)); 301 efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50));
302 efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); 302 efl_event_callback_add(center_btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data);
303 303
304 Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 304 Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
305 efl_text_set(top_btn, "Top Align"); 305 efl_text_set(top_btn, "Top Align");
306 efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150)); 306 efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150));
307 efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50)); 307 efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50));
308 efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); 308 efl_event_callback_add(top_btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data);
309 309
310 Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 310 Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
311 efl_text_set(left_btn, "Left Align"); 311 efl_text_set(left_btn, "Left Align");
312 efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200)); 312 efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200));
313 efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50)); 313 efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50));
314 efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); 314 efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data);
315 315
316 Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 316 Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
317 efl_text_set(right_btn, "Right Align"); 317 efl_text_set(right_btn, "Right Align");
318 efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200)); 318 efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200));
319 efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50)); 319 efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50));
320 efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); 320 efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data);
321 321
322 Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 322 Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
323 efl_text_set(bottom_btn, "Bottom Align"); 323 efl_text_set(bottom_btn, "Bottom Align");
324 efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250)); 324 efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250));
325 efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50)); 325 efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50));
326 efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); 326 efl_event_callback_add(bottom_btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data);
327 327
328 Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 328 Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
329 efl_text_set(position_btn, "Position Set (x:0, y:0)"); 329 efl_text_set(position_btn, "Position Set (x:0, y:0)");
330 efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250)); 330 efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250));
331 efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50)); 331 efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50));
332 efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); 332 efl_event_callback_add(position_btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data);
333} 333}
334 334
335static void 335static void
@@ -517,31 +517,31 @@ test_ui_scroll_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
517 efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)"); 517 efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)");
518 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0)); 518 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
519 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 519 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
520 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win); 520 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case1_cb, win);
521 521
522 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 522 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
523 efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)"); 523 efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)");
524 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50)); 524 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
525 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 525 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
526 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win); 526 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case2_cb, win);
527 527
528 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 528 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
529 efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)"); 529 efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)");
530 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100)); 530 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
531 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 531 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
532 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win); 532 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case3_cb, win);
533 533
534 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 534 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
535 efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)"); 535 efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)");
536 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150)); 536 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
537 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 537 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
538 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win); 538 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case4_cb, win);
539 539
540 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 540 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
541 efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)"); 541 efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)");
542 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200)); 542 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
543 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 543 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
544 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win); 544 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case5_cb, win);
545} 545}
546 546
547static void 547static void
@@ -900,85 +900,85 @@ test_ui_text_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
900 efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)"); 900 efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)");
901 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0)); 901 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
902 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 902 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
903 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win); 903 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case1_cb, win);
904 904
905 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 905 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
906 efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)"); 906 efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)");
907 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50)); 907 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
908 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 908 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
909 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win); 909 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case2_cb, win);
910 910
911 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 911 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
912 efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)"); 912 efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)");
913 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100)); 913 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
914 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 914 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
915 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win); 915 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case3_cb, win);
916 916
917 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 917 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
918 efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)"); 918 efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)");
919 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150)); 919 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
920 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 920 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
921 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win); 921 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case4_cb, win);
922 922
923 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 923 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
924 efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)"); 924 efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)");
925 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200)); 925 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
926 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 926 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
927 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win); 927 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case5_cb, win);
928 928
929 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 929 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
930 efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)"); 930 efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)");
931 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250)); 931 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250));
932 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 932 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
933 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win); 933 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case6_cb, win);
934 934
935 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 935 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
936 efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)"); 936 efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)");
937 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300)); 937 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300));
938 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 938 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
939 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win); 939 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case7_cb, win);
940 940
941 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 941 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
942 efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)"); 942 efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)");
943 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350)); 943 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350));
944 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 944 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
945 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win); 945 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case8_cb, win);
946 946
947 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 947 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
948 efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)"); 948 efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)");
949 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400)); 949 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400));
950 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 950 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
951 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win); 951 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case9_cb, win);
952 952
953 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 953 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
954 efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)"); 954 efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)");
955 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450)); 955 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450));
956 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 956 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
957 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win); 957 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case10_cb, win);
958 958
959 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 959 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
960 efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)"); 960 efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)");
961 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500)); 961 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500));
962 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 962 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
963 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win); 963 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case11_cb, win);
964 964
965 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 965 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
966 efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)"); 966 efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)");
967 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550)); 967 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550));
968 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 968 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
969 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win); 969 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case12_cb, win);
970 970
971 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 971 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
972 efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)"); 972 efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)");
973 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600)); 973 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600));
974 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 974 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
975 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win); 975 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case13_cb, win);
976 976
977 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 977 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
978 efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)"); 978 efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)");
979 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650)); 979 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650));
980 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 980 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
981 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win); 981 efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case14_cb, win);
982} 982}
983 983
984static void 984static void
@@ -1036,7 +1036,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
1036 btn = efl_add(EFL_UI_BUTTON_CLASS, win); 1036 btn = efl_add(EFL_UI_BUTTON_CLASS, win);
1037 efl_text_set(btn, "anchor"); 1037 efl_text_set(btn, "anchor");
1038 efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1038 efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1039 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup); 1039 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup);
1040 1040
1041 snprintf(buf, sizeof(buf), "anchor%d", i+1); 1041 snprintf(buf, sizeof(buf), "anchor%d", i+1);
1042 efl_content_set(efl_part(layout, buf), btn); 1042 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
1045 btn = efl_add(EFL_UI_BUTTON_CLASS, win); 1045 btn = efl_add(EFL_UI_BUTTON_CLASS, win);
1046 efl_text_set(btn, "anchor none"); 1046 efl_text_set(btn, "anchor none");
1047 efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1047 efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1048 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup); 1048 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup);
1049 efl_content_set(efl_part(layout, "anchor_none"), btn); 1049 efl_content_set(efl_part(layout, "anchor_none"), btn);
1050 1050
1051 Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup); 1051 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
1054 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1054 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1055 efl_text_set(btn, "Center Align"); 1055 efl_text_set(btn, "Center Align");
1056 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); 1056 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
1057 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); 1057 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data);
1058 efl_pack_table(table, btn, 0, 0, 2, 1); 1058 efl_pack_table(table, btn, 0, 0, 2, 1);
1059 1059
1060 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1060 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1061 efl_text_set(btn, "Top Align"); 1061 efl_text_set(btn, "Top Align");
1062 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); 1062 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
1063 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); 1063 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data);
1064 efl_pack_table(table, btn, 2, 0, 2, 1); 1064 efl_pack_table(table, btn, 2, 0, 2, 1);
1065 1065
1066 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1066 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1067 efl_text_set(btn, "Bottom Align"); 1067 efl_text_set(btn, "Bottom Align");
1068 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); 1068 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
1069 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); 1069 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data);
1070 efl_pack_table(table, btn, 4, 0, 2, 1); 1070 efl_pack_table(table, btn, 4, 0, 2, 1);
1071 1071
1072 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1072 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1073 efl_text_set(btn, "Left Align"); 1073 efl_text_set(btn, "Left Align");
1074 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 1074 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1075 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); 1075 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data);
1076 efl_pack_table(table, btn, 0, 1, 3, 1); 1076 efl_pack_table(table, btn, 0, 1, 3, 1);
1077 1077
1078 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1078 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1079 efl_text_set(btn, "Right Align"); 1079 efl_text_set(btn, "Right Align");
1080 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 1080 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1081 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); 1081 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data);
1082 efl_pack_table(table, btn, 3, 1, 3, 1); 1082 efl_pack_table(table, btn, 3, 1, 3, 1);
1083 1083
1084 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1084 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1085 efl_text_set(btn, "Position Set"); 1085 efl_text_set(btn, "Position Set");
1086 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 1086 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1087 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); 1087 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data);
1088 efl_pack_table(table, btn, 0, 2, 3, 1); 1088 efl_pack_table(table, btn, 0, 2, 3, 1);
1089 1089
1090 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); 1090 btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
1091 efl_text_set(btn, "Resize"); 1091 efl_text_set(btn, "Resize");
1092 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 1092 efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
1093 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data); 1093 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _popup_resize_cb, p_data);
1094 efl_pack_table(table, btn, 3, 2, 3, 1); 1094 efl_pack_table(table, btn, 3, 2, 3, 1);
1095 1095
1096 efl_content_set(efl_ui_popup, table); 1096 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
224 224
225 pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx, 225 pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx,
226 efl_text_set(efl_added, "start"), 226 efl_text_set(efl_added, "start"),
227 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 227 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
228 _start_btn_clicked_cb, pd), 228 _start_btn_clicked_cb, pd),
229 efl_pack(btbx, efl_added) 229 efl_pack(btbx, efl_added)
230 ); 230 );
231 231
232 pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx, 232 pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx,
233 efl_text_set(efl_added, "stop"), 233 efl_text_set(efl_added, "stop"),
234 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 234 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
235 _stop_btn_clicked_cb, pd), 235 _stop_btn_clicked_cb, pd),
236 efl_pack(btbx, efl_added) 236 efl_pack(btbx, efl_added)
237 ); 237 );
238 pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx, 238 pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx,
239 efl_text_set(efl_added, "reset"), 239 efl_text_set(efl_added, "reset"),
240 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 240 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
241 _reset_btn_clicked_cb, pd), 241 _reset_btn_clicked_cb, pd),
242 efl_pack(btbx, efl_added) 242 efl_pack(btbx, efl_added)
243 ); 243 );
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,
119 o = efl_add(EFL_UI_BUTTON_CLASS, table); 119 o = efl_add(EFL_UI_BUTTON_CLASS, table);
120 efl_pack_table(table, o, 1, 0, 1, 1); 120 efl_pack_table(table, o, 1, 0, 1, 1);
121 efl_text_set(o, "Selected France check"); 121 efl_text_set(o, "Selected France check");
122 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2)); 122 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2));
123 123
124 o = efl_add(EFL_UI_BUTTON_CLASS, table); 124 o = efl_add(EFL_UI_BUTTON_CLASS, table);
125 efl_pack_table(table, o, 1, 1, 1, 1); 125 efl_pack_table(table, o, 1, 1, 1, 1);
126 efl_text_set(o, "Set value for Germany"); 126 efl_text_set(o, "Set value for Germany");
127 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_btn_clicked, bx); 127 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_btn_clicked, bx);
128 128
129 o = efl_add(EFL_UI_BUTTON_CLASS, table); 129 o = efl_add(EFL_UI_BUTTON_CLASS, table);
130 efl_pack_table(table, o, 1, 2, 1, 1); 130 efl_pack_table(table, o, 1, 2, 1, 1);
131 efl_text_set(o, "Set object for UK"); 131 efl_text_set(o, "Set object for UK");
132 efl_key_data_set(o, "uk", uk); 132 efl_key_data_set(o, "uk", uk);
133 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_object_btn_clicked, bx); 133 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_object_btn_clicked, bx);
134 134
135 eina_array_free(arr); 135 eina_array_free(arr);
136} 136}
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)
167 efl_key_wref_set(efl_added, "to", to), 167 efl_key_wref_set(efl_added, "to", to),
168 efl_key_wref_set(efl_added, "btn", btn), 168 efl_key_wref_set(efl_added, "btn", btn),
169 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND), 169 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
170 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option), 170 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option),
171 efl_pack(hbox, efl_added)); 171 efl_pack(hbox, efl_added));
172 172
173 efl_add(EFL_UI_SLIDER_CLASS, hbox, 173 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
308 btn1 = efl_add(EFL_UI_BUTTON_CLASS, layout, 308 btn1 = efl_add(EFL_UI_BUTTON_CLASS, layout,
309 efl_text_set(efl_added, "button1"), 309 efl_text_set(efl_added, "button1"),
310 efl_gfx_hint_align_set(efl_added, 0.0, 0.0), 310 efl_gfx_hint_align_set(efl_added, 0.0, 0.0),
311 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_color_clicked_cb, layout), 311 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_color_clicked_cb, layout),
312 efl_ui_relative_layout_relation_right_set(layout, efl_added, layout, 0.0), 312 efl_ui_relative_layout_relation_right_set(layout, efl_added, layout, 0.0),
313 efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0)); 313 efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0));
314 314
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
60 efl_text_set(efl_added, "Vertical"), 60 efl_text_set(efl_added, "Vertical"),
61 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 61 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
62 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 62 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
63 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 63 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
64 efl_pack(bx, efl_added)); 64 efl_pack(bx, efl_added));
65 } 65 }
66 66
@@ -76,7 +76,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
76 { 76 {
77 efl_add(EFL_UI_BUTTON_CLASS, bx2, 77 efl_add(EFL_UI_BUTTON_CLASS, bx2,
78 efl_text_set(efl_added, "... Horizontal scrolling ..."), 78 efl_text_set(efl_added, "... Horizontal scrolling ..."),
79 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 79 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
80 efl_pack(bx2, efl_added)); 80 efl_pack(bx2, efl_added));
81 } 81 }
82 82
@@ -86,7 +86,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
86 efl_text_set(efl_added, "Vertical"), 86 efl_text_set(efl_added, "Vertical"),
87 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 87 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
88 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 88 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
89 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 89 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
90 efl_pack(bx, efl_added)); 90 efl_pack(bx, efl_added));
91 } 91 }
92 92
@@ -114,7 +114,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
114 { 114 {
115 efl_add(EFL_UI_BUTTON_CLASS, win, 115 efl_add(EFL_UI_BUTTON_CLASS, win,
116 efl_text_set(efl_added, "Both"), 116 efl_text_set(efl_added, "Both"),
117 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 117 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
118 efl_pack_table(gd2, efl_added, i, j, 1, 1)); 118 efl_pack_table(gd2, efl_added, i, j, 1, 1));
119 } 119 }
120 } 120 }
@@ -125,7 +125,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
125 efl_text_set(efl_added, "Vertical"), 125 efl_text_set(efl_added, "Vertical"),
126 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 126 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
127 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 127 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
128 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 128 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
129 efl_pack(bx, efl_added)); 129 efl_pack(bx, efl_added));
130 } 130 }
131} 131}
@@ -161,7 +161,7 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
161 efl_text_set(efl_added, "Vertical"), 161 efl_text_set(efl_added, "Vertical"),
162 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 162 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
163 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 163 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
164 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 164 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
165 efl_pack(bx, efl_added)); 165 efl_pack(bx, efl_added));
166 } 166 }
167} 167}
@@ -197,13 +197,13 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
197 efl_text_set(efl_added, "Vertical"), 197 efl_text_set(efl_added, "Vertical"),
198 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 198 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
199 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 199 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
200 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 200 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
201 efl_pack_table(tb, efl_added, 0, i, 1, 1)); 201 efl_pack_table(tb, efl_added, 0, i, 1, 1));
202 efl_add(EFL_UI_BUTTON_CLASS, tb, 202 efl_add(EFL_UI_BUTTON_CLASS, tb,
203 efl_text_set(efl_added, "Horizontal"), 203 efl_text_set(efl_added, "Horizontal"),
204 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 204 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
205 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 205 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
206 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), 206 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
207 efl_pack_table(tb, efl_added, 1, i, 1, 1)); 207 efl_pack_table(tb, efl_added, 1, i, 1, 1));
208 } 208 }
209} 209}
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
58 58
59 efl_add(EFL_UI_BUTTON_CLASS, bx, 59 efl_add(EFL_UI_BUTTON_CLASS, bx,
60 efl_text_set(efl_added, "Increse Spinner value"), 60 efl_text_set(efl_added, "Increse Spinner value"),
61 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _inc_clicked, sp), 61 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _inc_clicked, sp),
62 efl_pack(bx, efl_added)); 62 efl_pack(bx, efl_added));
63 63
64 efl_add(EFL_UI_BUTTON_CLASS, bx, 64 efl_add(EFL_UI_BUTTON_CLASS, bx,
65 efl_text_set(efl_added, "Decrease Spinner value"), 65 efl_text_set(efl_added, "Decrease Spinner value"),
66 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp), 66 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _dec_clicked, sp),
67 efl_pack(bx, efl_added)); 67 efl_pack(bx, efl_added));
68 68
69 efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 120)); 69 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)
101 case BUTTON: 101 case BUTTON:
102 page = efl_add(EFL_UI_BUTTON_CLASS, parent, 102 page = efl_add(EFL_UI_BUTTON_CLASS, parent,
103 efl_text_set(efl_added, "Button Page")); 103 efl_text_set(efl_added, "Button Page"));
104 efl_event_callback_add(page, EFL_UI_EVENT_CLICKED, page_clicked_cb, NULL); 104 efl_event_callback_add(page, EFL_INPUT_EVENT_CLICKED, page_clicked_cb, NULL);
105 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 105 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
106 break; 106 break;
107 107
@@ -370,7 +370,7 @@ spotlight_size(void *data,
370 370
371 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 371 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
372 efl_text_set(efl_added, "Back"), 372 efl_text_set(efl_added, "Back"),
373 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 373 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
374 back_btn_cb, navi)); 374 back_btn_cb, navi));
375 375
376 box = efl_add(EFL_UI_BOX_CLASS, navi, 376 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -479,7 +479,7 @@ view_animation_cb(void *data,
479 479
480 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 480 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
481 efl_text_set(efl_added, "Back"), 481 efl_text_set(efl_added, "Back"),
482 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 482 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
483 back_btn_cb, navi)); 483 back_btn_cb, navi));
484 484
485 box = efl_add(EFL_UI_BOX_CLASS, navi, 485 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -508,7 +508,7 @@ pack_cb(void *data,
508 508
509 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 509 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
510 efl_text_set(efl_added, "Back"), 510 efl_text_set(efl_added, "Back"),
511 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 511 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
512 back_btn_cb, navi)); 512 back_btn_cb, navi));
513 513
514 box = efl_add(EFL_UI_BOX_CLASS, navi, 514 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -549,7 +549,7 @@ pack_cb(void *data,
549 549
550 efl_add(EFL_UI_BUTTON_CLASS, box, 550 efl_add(EFL_UI_BUTTON_CLASS, box,
551 efl_text_set(efl_added, "Pack Begin"), 551 efl_text_set(efl_added, "Pack Begin"),
552 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 552 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
553 pack_btn_cb, pack_param), 553 pack_btn_cb, pack_param),
554 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 554 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
555 pack_btn_del_cb, pack_param), 555 pack_btn_del_cb, pack_param),
@@ -567,7 +567,7 @@ pack_cb(void *data,
567 567
568 efl_add(EFL_UI_BUTTON_CLASS, box, 568 efl_add(EFL_UI_BUTTON_CLASS, box,
569 efl_text_set(efl_added, "Pack End"), 569 efl_text_set(efl_added, "Pack End"),
570 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 570 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
571 pack_btn_cb, pack_param), 571 pack_btn_cb, pack_param),
572 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 572 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
573 pack_btn_del_cb, pack_param), 573 pack_btn_del_cb, pack_param),
@@ -585,7 +585,7 @@ pack_cb(void *data,
585 585
586 efl_add(EFL_UI_BUTTON_CLASS, box, 586 efl_add(EFL_UI_BUTTON_CLASS, box,
587 efl_text_set(efl_added, "Pack Before Current Page"), 587 efl_text_set(efl_added, "Pack Before Current Page"),
588 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 588 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
589 pack_btn_cb, pack_param), 589 pack_btn_cb, pack_param),
590 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 590 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
591 pack_btn_del_cb, pack_param), 591 pack_btn_del_cb, pack_param),
@@ -603,7 +603,7 @@ pack_cb(void *data,
603 603
604 efl_add(EFL_UI_BUTTON_CLASS, box, 604 efl_add(EFL_UI_BUTTON_CLASS, box,
605 efl_text_set(efl_added, "Pack After Current Page"), 605 efl_text_set(efl_added, "Pack After Current Page"),
606 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 606 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
607 pack_btn_cb, pack_param), 607 pack_btn_cb, pack_param),
608 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 608 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
609 pack_btn_del_cb, pack_param), 609 pack_btn_del_cb, pack_param),
@@ -621,7 +621,7 @@ pack_cb(void *data,
621 621
622 efl_add(EFL_UI_BUTTON_CLASS, in_box1, 622 efl_add(EFL_UI_BUTTON_CLASS, in_box1,
623 efl_text_set(efl_added, "Pack At"), 623 efl_text_set(efl_added, "Pack At"),
624 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 624 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
625 pack_btn_cb, pack_param), 625 pack_btn_cb, pack_param),
626 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 626 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
627 pack_btn_del_cb, pack_param), 627 pack_btn_del_cb, pack_param),
@@ -640,7 +640,7 @@ pack_cb(void *data,
640 pack_param->unpack_btn = btn; 640 pack_param->unpack_btn = btn;
641 pack_param->type = UNPACK_AT; 641 pack_param->type = UNPACK_AT;
642 642
643 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, 643 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
644 pack_btn_cb, pack_param); 644 pack_btn_cb, pack_param);
645 efl_event_callback_add(btn, EFL_EVENT_DEL, 645 efl_event_callback_add(btn, EFL_EVENT_DEL,
646 pack_btn_del_cb, pack_param); 646 pack_btn_del_cb, pack_param);
@@ -674,7 +674,7 @@ pack_cb(void *data,
674 674
675 efl_add(EFL_UI_BUTTON_CLASS, box, 675 efl_add(EFL_UI_BUTTON_CLASS, box,
676 efl_text_set(efl_added, "Clear"), 676 efl_text_set(efl_added, "Clear"),
677 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 677 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
678 pack_btn_cb, pack_param), 678 pack_btn_cb, pack_param),
679 efl_event_callback_add(efl_added, EFL_EVENT_DEL, 679 efl_event_callback_add(efl_added, EFL_EVENT_DEL,
680 pack_btn_del_cb, pack_param), 680 pack_btn_del_cb, pack_param),
@@ -695,7 +695,7 @@ active_index_cb(void *data,
695 695
696 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 696 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
697 efl_text_set(efl_added, "Back"), 697 efl_text_set(efl_added, "Back"),
698 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 698 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
699 back_btn_cb, navi)); 699 back_btn_cb, navi));
700 700
701 box = efl_add(EFL_UI_BOX_CLASS, navi, 701 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -727,7 +727,7 @@ active_index_cb(void *data,
727 psp->spotlight = spotlight; 727 psp->spotlight = spotlight;
728 psp->spinner = sp; 728 psp->spinner = sp;
729 729
730 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp); 730 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
731 efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp); 731 efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
732} 732}
733 733
@@ -742,7 +742,7 @@ indicator_cb(void *data,
742 742
743 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 743 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
744 efl_text_set(efl_added, "Back"), 744 efl_text_set(efl_added, "Back"),
745 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 745 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
746 back_btn_cb, navi)); 746 back_btn_cb, navi));
747 747
748 box = efl_add(EFL_UI_BOX_CLASS, navi, 748 box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -752,13 +752,13 @@ indicator_cb(void *data,
752 752
753 efl_add(EFL_UI_BUTTON_CLASS, box, 753 efl_add(EFL_UI_BUTTON_CLASS, box,
754 efl_text_set(efl_added, "Icon Type"), 754 efl_text_set(efl_added, "Icon Type"),
755 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 755 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
756 indicator_icon_btn_cb, params), 756 indicator_icon_btn_cb, params),
757 efl_pack_end(box, efl_added)); 757 efl_pack_end(box, efl_added));
758 758
759 efl_add(EFL_UI_BUTTON_CLASS, box, 759 efl_add(EFL_UI_BUTTON_CLASS, box,
760 efl_text_set(efl_added, "None"), 760 efl_text_set(efl_added, "None"),
761 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 761 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
762 indicator_none_btn_cb, params), 762 indicator_none_btn_cb, params),
763 efl_pack_end(box, efl_added)); 763 efl_pack_end(box, efl_added));
764} 764}
@@ -810,13 +810,13 @@ test_ui_spotlight_stack(void *data EINA_UNUSED,
810 efl_add(EFL_UI_BUTTON_CLASS, layout, 810 efl_add(EFL_UI_BUTTON_CLASS, layout,
811 efl_text_set(efl_added, "Prev"), 811 efl_text_set(efl_added, "Prev"),
812 efl_event_callback_add(efl_added, 812 efl_event_callback_add(efl_added,
813 EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight), 813 EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
814 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 814 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
815 815
816 efl_add(EFL_UI_BUTTON_CLASS, layout, 816 efl_add(EFL_UI_BUTTON_CLASS, layout,
817 efl_text_set(efl_added, "Next"), 817 efl_text_set(efl_added, "Next"),
818 efl_event_callback_add(efl_added, 818 efl_event_callback_add(efl_added,
819 EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight), 819 EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
820 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 820 efl_content_set(efl_part(layout, "next_btn"), efl_added));
821 821
822 params = calloc(1, sizeof(Params)); 822 params = calloc(1, sizeof(Params));
@@ -910,13 +910,13 @@ test_ui_spotlight_plain(void *data EINA_UNUSED,
910 efl_add(EFL_UI_BUTTON_CLASS, layout, 910 efl_add(EFL_UI_BUTTON_CLASS, layout,
911 efl_text_set(efl_added, "Prev"), 911 efl_text_set(efl_added, "Prev"),
912 efl_event_callback_add(efl_added, 912 efl_event_callback_add(efl_added,
913 EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight), 913 EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
914 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 914 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
915 915
916 efl_add(EFL_UI_BUTTON_CLASS, layout, 916 efl_add(EFL_UI_BUTTON_CLASS, layout,
917 efl_text_set(efl_added, "Next"), 917 efl_text_set(efl_added, "Next"),
918 efl_event_callback_add(efl_added, 918 efl_event_callback_add(efl_added,
919 EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight), 919 EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
920 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 920 efl_content_set(efl_part(layout, "next_btn"), efl_added));
921 921
922 params = calloc(1, sizeof(Params)); 922 params = calloc(1, sizeof(Params));
@@ -1011,13 +1011,13 @@ test_ui_spotlight_scroll(void *data EINA_UNUSED,
1011 efl_add(EFL_UI_BUTTON_CLASS, layout, 1011 efl_add(EFL_UI_BUTTON_CLASS, layout,
1012 efl_text_set(efl_added, "Prev"), 1012 efl_text_set(efl_added, "Prev"),
1013 efl_event_callback_add(efl_added, 1013 efl_event_callback_add(efl_added,
1014 EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight), 1014 EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
1015 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 1015 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
1016 1016
1017 efl_add(EFL_UI_BUTTON_CLASS, layout, 1017 efl_add(EFL_UI_BUTTON_CLASS, layout,
1018 efl_text_set(efl_added, "Next"), 1018 efl_text_set(efl_added, "Next"),
1019 efl_event_callback_add(efl_added, 1019 efl_event_callback_add(efl_added,
1020 EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight), 1020 EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
1021 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 1021 efl_content_set(efl_part(layout, "next_btn"), efl_added));
1022 1022
1023 params = calloc(1, sizeof(Params)); 1023 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)
70 efl_text_set(left_btn, "Prev"); 70 efl_text_set(left_btn, "Prev");
71 efl_content_set(efl_part(bn, "left_content"), left_btn); 71 efl_content_set(efl_part(bn, "left_content"), left_btn);
72 72
73 efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data); 73 efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data);
74 74
75 //Positions of "left_content" and "back_button" are the same. 75 //Positions of "left_content" and "back_button" are the same.
76 efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE); 76 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)
85 efl_text_set(right_btn, "Next"); 85 efl_text_set(right_btn, "Next");
86 efl_content_set(efl_part(bn, "right_content"), right_btn); 86 efl_content_set(efl_part(bn, "right_content"), right_btn);
87 87
88 efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data); 88 efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data);
89} 89}
90 90
91static void 91static void
@@ -95,7 +95,7 @@ _fifth_layout_insert(void *data, const Efl_Event *ev EINA_UNUSED)
95 95
96 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); 96 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
97 efl_text_set(btn, "Press to remove top layout"); 97 efl_text_set(btn, "Press to remove top layout");
98 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_remove, stack); 98 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_remove, stack);
99 99
100 Eo *nl = _navigation_layout_create(stack, "5th layout", btn); 100 Eo *nl = _navigation_layout_create(stack, "5th layout", btn);
101 101
@@ -109,7 +109,7 @@ _third_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
109 109
110 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); 110 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
111 efl_text_set(btn, "Press to pop"); 111 efl_text_set(btn, "Press to pop");
112 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_pop, stack); 112 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_pop, stack);
113 113
114 Eo *nl = _navigation_layout_create(stack, "3rd layout", btn); 114 Eo *nl = _navigation_layout_create(stack, "3rd layout", btn);
115 115
@@ -125,7 +125,7 @@ _second_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
125 125
126 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); 126 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
127 efl_text_set(btn, "Press to double push"); 127 efl_text_set(btn, "Press to double push");
128 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_double_push, stack); 128 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_double_push, stack);
129 129
130 Eo *nl = _navigation_layout_create(stack, "2nd layout", btn); 130 Eo *nl = _navigation_layout_create(stack, "2nd layout", btn);
131 131
@@ -139,7 +139,7 @@ _first_layout_push(Eo *win, Eo *stack)
139{ 139{
140 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack); 140 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
141 efl_text_set(btn, "Press to delete stack"); 141 efl_text_set(btn, "Press to delete stack");
142 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_del, stack); 142 efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_del, stack);
143 143
144 Eo *nl = _navigation_layout_create(stack, "1st layout", btn); 144 Eo *nl = _navigation_layout_create(stack, "1st layout", btn);
145 145
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)
222 222
223 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 223 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
224 efl_text_set(efl_added, "Back"), 224 efl_text_set(efl_added, "Back"),
225 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 225 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
226 226
227 box = efl_add(EFL_UI_BOX_CLASS, navi, 227 box = efl_add(EFL_UI_BOX_CLASS, navi,
228 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 228 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)
238 238
239 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 239 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
240 efl_text_set(efl_added, "Current Tab Page Set"), 240 efl_text_set(efl_added, "Current Tab Page Set"),
241 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tab_set_btn_cb, tsd), 241 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tab_set_btn_cb, tsd),
242 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _tab_set_btn_del_cb, tsd), 242 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _tab_set_btn_del_cb, tsd),
243 efl_pack_end(box, efl_added)); 243 efl_pack_end(box, efl_added));
244} 244}
@@ -327,7 +327,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
327 327
328 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 328 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
329 efl_text_set(efl_added, "Back"), 329 efl_text_set(efl_added, "Back"),
330 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 330 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
331 331
332 box = efl_add(EFL_UI_BOX_CLASS, navi, 332 box = efl_add(EFL_UI_BOX_CLASS, navi,
333 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 333 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)
336 /* Pack Begin */ 336 /* Pack Begin */
337 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 337 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
338 efl_text_set(efl_added, "Pack Begin"), 338 efl_text_set(efl_added, "Pack Begin"),
339 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager), 339 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager),
340 efl_pack_end(box, efl_added)); 340 efl_pack_end(box, efl_added));
341 341
342 /* Pack End */ 342 /* Pack End */
343 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 343 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
344 efl_text_set(efl_added, "Pack End"), 344 efl_text_set(efl_added, "Pack End"),
345 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_end_btn_cb, tab_pager), 345 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_end_btn_cb, tab_pager),
346 efl_pack_end(box, efl_added)); 346 efl_pack_end(box, efl_added));
347 347
348 /* Pack Before */ 348 /* Pack Before */
349 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 349 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
350 efl_text_set(efl_added, "Pack Before Current Tab Page"), 350 efl_text_set(efl_added, "Pack Before Current Tab Page"),
351 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_before_btn_cb, tab_pager), 351 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_before_btn_cb, tab_pager),
352 efl_pack_end(box, efl_added)); 352 efl_pack_end(box, efl_added));
353 353
354 /* Pack After */ 354 /* Pack After */
355 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 355 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
356 efl_text_set(efl_added, "Pack After Current Tab Page"), 356 efl_text_set(efl_added, "Pack After Current Tab Page"),
357 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_after_btn_cb, tab_pager), 357 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_after_btn_cb, tab_pager),
358 efl_pack_end(box, efl_added)); 358 efl_pack_end(box, efl_added));
359 359
360 in_box = efl_add(EFL_UI_BOX_CLASS, box, 360 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)
373 /* Pack At */ 373 /* Pack At */
374 btn = efl_add(EFL_UI_BUTTON_CLASS, in_box, 374 btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
375 efl_text_set(efl_added, "Pack At"), 375 efl_text_set(efl_added, "Pack At"),
376 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_at_btn_cb, tsd), 376 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_at_btn_cb, tsd),
377 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _pack_at_btn_del_cb, tsd), 377 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _pack_at_btn_del_cb, tsd),
378 efl_pack_end(in_box, efl_added)); 378 efl_pack_end(in_box, efl_added));
379} 379}
@@ -431,7 +431,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
431 431
432 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 432 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
433 efl_text_set(efl_added, "Back"), 433 efl_text_set(efl_added, "Back"),
434 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 434 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
435 435
436 box = efl_add(EFL_UI_BOX_CLASS, navi, 436 box = efl_add(EFL_UI_BOX_CLASS, navi,
437 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 437 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)
440 /* Clear */ 440 /* Clear */
441 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 441 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
442 efl_text_set(efl_added, "Clear"), 442 efl_text_set(efl_added, "Clear"),
443 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clear_btn_cb, tab_pager), 443 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clear_btn_cb, tab_pager),
444 efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented 444 efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
445 efl_pack_end(box, efl_added)); 445 efl_pack_end(box, efl_added));
446 446
447 /* Unpack */ 447 /* Unpack */
448 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 448 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
449 efl_text_set(efl_added, "Unpack"), 449 efl_text_set(efl_added, "Unpack"),
450 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_btn_cb, tab_pager), 450 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_btn_cb, tab_pager),
451 efl_pack_end(box, efl_added)); 451 efl_pack_end(box, efl_added));
452 452
453 /* Unpack All */ 453 /* Unpack All */
454 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 454 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
455 efl_text_set(efl_added, "Unpack All"), 455 efl_text_set(efl_added, "Unpack All"),
456 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager), 456 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager),
457 efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented 457 efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
458 efl_pack_end(box, efl_added)); 458 efl_pack_end(box, efl_added));
459 459
@@ -473,7 +473,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
473 /* Unpack At */ 473 /* Unpack At */
474 btn = efl_add(EFL_UI_BUTTON_CLASS, in_box, 474 btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
475 efl_text_set(efl_added, "Unpack At"), 475 efl_text_set(efl_added, "Unpack At"),
476 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_at_btn_cb, tsd), 476 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_at_btn_cb, tsd),
477 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _unpack_at_btn_del_cb, tsd), 477 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _unpack_at_btn_del_cb, tsd),
478 efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented 478 efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
479 efl_pack_end(in_box, efl_added)); 479 efl_pack_end(in_box, efl_added));
@@ -526,7 +526,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
526 526
527 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 527 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
528 efl_text_set(efl_added, "Back"), 528 efl_text_set(efl_added, "Back"),
529 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 529 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
530 530
531 box = efl_add(EFL_UI_BOX_CLASS, navi, 531 box = efl_add(EFL_UI_BOX_CLASS, navi,
532 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 532 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)
548 548
549 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 549 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
550 efl_text_set(efl_added, "Change"), 550 efl_text_set(efl_added, "Change"),
551 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _change_btn_cb, tcd), 551 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _change_btn_cb, tcd),
552 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _change_btn_del_cb, tcd), 552 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _change_btn_del_cb, tcd),
553 efl_pack_end(box, efl_added)); 553 efl_pack_end(box, efl_added));
554} 554}
@@ -586,7 +586,7 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
586 586
587 btn = efl_add(EFL_UI_BUTTON_CLASS, navi, 587 btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
588 efl_text_set(efl_added, "Back"), 588 efl_text_set(efl_added, "Back"),
589 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 589 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
590 590
591 box = efl_add(EFL_UI_BOX_CLASS, navi, 591 box = efl_add(EFL_UI_BOX_CLASS, navi,
592 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 592 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)
594 594
595 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 595 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
596 efl_text_set(efl_added, "Scroll"), 596 efl_text_set(efl_added, "Scroll"),
597 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager), 597 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager),
598 efl_pack_end(box, efl_added)); 598 efl_pack_end(box, efl_added));
599 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 599 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
600 efl_text_set(efl_added, "Stack"), 600 efl_text_set(efl_added, "Stack"),
601 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager), 601 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager),
602 efl_pack_end(box, efl_added)); 602 efl_pack_end(box, efl_added));
603 603
604 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 604 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
605 efl_text_set(efl_added, "Unset"), 605 efl_text_set(efl_added, "Unset"),
606 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager), 606 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager),
607 efl_pack_end(box, efl_added)); 607 efl_pack_end(box, efl_added));
608} 608}
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)
543 efl_text_set(o, btn_text("appended")); 543 efl_text_set(o, btn_text("appended"));
544 efl_gfx_hint_weight_set(o, 0, 0); 544 efl_gfx_hint_weight_set(o, 0, 0);
545 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 545 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
546 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 546 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
547 elm_object_tooltip_text_set(o, "Click to unpack"); 547 elm_object_tooltip_text_set(o, "Click to unpack");
548 efl_pack(table, o); 548 efl_pack(table, o);
549 efl_gfx_entity_visible_set(o, 1); 549 efl_gfx_entity_visible_set(o, 1);
@@ -597,7 +597,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
597 o = elm_button_add(win); 597 o = elm_button_add(win);
598 elm_object_content_set(o, ico); 598 elm_object_content_set(o, ico);
599 elm_object_text_set(o, "Append"); 599 elm_object_text_set(o, "Append");
600 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table); 600 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, append_cb, table);
601 efl_pack(hbox, o); 601 efl_pack(hbox, o);
602 efl_gfx_entity_visible_set(o, 1); 602 efl_gfx_entity_visible_set(o, 1);
603 603
@@ -606,7 +606,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
606 o = elm_button_add(win); 606 o = elm_button_add(win);
607 elm_object_content_set(o, ico); 607 elm_object_content_set(o, ico);
608 elm_object_text_set(o, "Clear"); 608 elm_object_text_set(o, "Clear");
609 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table); 609 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, clear_cb, table);
610 efl_pack(hbox, o); 610 efl_pack(hbox, o);
611 efl_gfx_entity_visible_set(o, 1); 611 efl_gfx_entity_visible_set(o, 1);
612 612
@@ -657,7 +657,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
657 efl_text_set(o, btn_text(NULL)); 657 efl_text_set(o, btn_text(NULL));
658 efl_gfx_hint_weight_set(o, 0, 0); 658 efl_gfx_hint_weight_set(o, 0, 0);
659 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 659 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
660 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 660 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
661 efl_pack(table, o); 661 efl_pack(table, o);
662 efl_gfx_entity_visible_set(o, 1); 662 efl_gfx_entity_visible_set(o, 1);
663 663
@@ -665,7 +665,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
665 efl_text_set(o, btn_text(NULL)); 665 efl_text_set(o, btn_text(NULL));
666 efl_gfx_hint_weight_set(o, 0, 0); 666 efl_gfx_hint_weight_set(o, 0, 0);
667 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 667 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
668 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 668 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
669 efl_pack(table, o); 669 efl_pack(table, o);
670 efl_gfx_entity_visible_set(o, 1); 670 efl_gfx_entity_visible_set(o, 1);
671 671
@@ -673,7 +673,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
673 efl_text_set(o, btn_text(NULL)); 673 efl_text_set(o, btn_text(NULL));
674 efl_gfx_hint_weight_set(o, 0, 0); 674 efl_gfx_hint_weight_set(o, 0, 0);
675 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 675 efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
676 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 676 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
677 efl_pack(table, o); 677 efl_pack(table, o);
678 efl_gfx_entity_visible_set(o, 1); 678 efl_gfx_entity_visible_set(o, 1);
679 679
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
133 133
134 bt = elm_button_add(win); 134 bt = elm_button_add(win);
135 elm_object_text_set(bt, "Next API function"); 135 elm_object_text_set(bt, "Next API function");
136 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api); 136 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _api_bt_clicked, api);
137 efl_pack_table(table, bt, 30, 0, 40, 10); 137 efl_pack_table(table, bt, 30, 0, 40, 10);
138 elm_object_disabled_set(bt, api->state == API_STATE_LAST); 138 elm_object_disabled_set(bt, api->state == API_STATE_LAST);
139 efl_gfx_entity_visible_set(bt, 1); 139 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
162 bt = elm_button_add(win); 162 bt = elm_button_add(win);
163 elm_object_text_set(bt, "Change"); 163 elm_object_text_set(bt, "Change");
164 efl_pack_table(table, bt, 40, 40, 20, 20); 164 efl_pack_table(table, bt, 40, 40, 20, 20);
165 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table); 165 efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _ch_table, table);
166 efl_gfx_entity_visible_set(bt, 1); 166 efl_gfx_entity_visible_set(bt, 1);
167 167
168 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); 168 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
83 83
84 efl_add(EFL_UI_BUTTON_CLASS, layout, 84 efl_add(EFL_UI_BUTTON_CLASS, layout,
85 efl_text_set(efl_added, "Change mode"), 85 efl_text_set(efl_added, "Change mode"),
86 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, tags), 86 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, tags),
87 elm_object_part_content_set(layout, "box", efl_added)); 87 elm_object_part_content_set(layout, "box", efl_added));
88 88
89 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 480)); 89 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
106 106
107 efl_add(EFL_UI_BUTTON_CLASS, win, 107 efl_add(EFL_UI_BUTTON_CLASS, win,
108 efl_text_set(efl_added, "Indicator Off"), 108 efl_text_set(efl_added, "Indicator Off"),
109 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _off_clicked, win), 109 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _off_clicked, win),
110 efl_pack(bx, efl_added)); 110 efl_pack(bx, efl_added));
111 efl_add(EFL_UI_BUTTON_CLASS, win, 111 efl_add(EFL_UI_BUTTON_CLASS, win,
112 efl_text_set(efl_added, "Bg Opaque"), 112 efl_text_set(efl_added, "Bg Opaque"),
113 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _opaque_clicked, win), 113 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _opaque_clicked, win),
114 efl_pack(bx, efl_added)); 114 efl_pack(bx, efl_added));
115 efl_add(EFL_UI_BUTTON_CLASS, win, 115 efl_add(EFL_UI_BUTTON_CLASS, win,
116 efl_text_set(efl_added, "Bg Transparent"), 116 efl_text_set(efl_added, "Bg Transparent"),
117 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _transparent_clicked, win), 117 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _transparent_clicked, win),
118 efl_pack(bx, efl_added)); 118 efl_pack(bx, efl_added));
119 efl_add(EFL_UI_BUTTON_CLASS, win, 119 efl_add(EFL_UI_BUTTON_CLASS, win,
120 efl_text_set(efl_added, "Hidden"), 120 efl_text_set(efl_added, "Hidden"),
121 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _hidden_clicked, win), 121 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _hidden_clicked, win),
122 efl_pack(bx, efl_added)); 122 efl_pack(bx, efl_added));
123} 123}