summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-05 19:42:02 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-06 17:09:42 +0200
commit9baa96c35271153d2b017fe072ee3e485b7f2c2b (patch)
tree92342c4ea72ccb0639004e7a08a7bb184813e109 /src/bin
parentc63b2d136ea8508a4cd2b31eebe02c0789441af1 (diff)
efl_ui_check: migrate from own property to Efl.Ui.Selectable
this is the basic work for getting radio group as a single_selection interface, which can be a part of mutli_selection. Which will come both later on. ref T8057 Differential Revision: https://phab.enlightenment.org/D9504
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/elementary/test_bg.c14
-rw-r--r--src/bin/elementary/test_ui_image.c8
-rw-r--r--src/bin/elementary/test_ui_item_container.c14
-rw-r--r--src/bin/elementary/test_ui_pager.c4
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c20
-rw-r--r--src/bin/elementary/test_ui_panel.c8
-rw-r--r--src/bin/elementary/test_ui_progressbar.c4
-rw-r--r--src/bin/elementary/test_ui_radio.c6
-rw-r--r--src/bin/elementary/test_ui_spotlight.c16
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c8
-rw-r--r--src/bin/elementary/test_ui_textpath.c6
11 files changed, 54 insertions, 54 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index ebcb3ded07..8362ab527f 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -389,7 +389,7 @@ _cb_check_changed_scale_type(void *data, const Efl_Event *ev)
389 Evas_Object *o_bg = data; 389 Evas_Object *o_bg = data;
390 int r, g, b, a; 390 int r, g, b, a;
391 391
392 if (efl_ui_check_selected_get(ev->object)) 392 if (efl_ui_selectable_selected_get(ev->object))
393 efl_gfx_color_set(o_bg, 255, 128, 128, 255); 393 efl_gfx_color_set(o_bg, 255, 128, 128, 255);
394 else 394 else
395 efl_gfx_color_set(o_bg, 255, 255, 255, 255); 395 efl_gfx_color_set(o_bg, 255, 255, 255, 255);
@@ -440,35 +440,35 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
440 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 440 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
441 efl_text_set(rd, "Fill"); 441 efl_text_set(rd, "Fill");
442 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 442 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
443 efl_event_callback_add(rd, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 443 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
444 efl_pack(hbox, rd); 444 efl_pack(hbox, rd);
445 445
446 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 446 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
447 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE); 447 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE);
448 efl_text_set(rd, "Fit Inside"); 448 efl_text_set(rd, "Fit Inside");
449 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 449 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
450 efl_event_callback_add(rd, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 450 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
451 efl_pack(hbox, rd); 451 efl_pack(hbox, rd);
452 452
453 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 453 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
454 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE); 454 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE);
455 efl_text_set(rd, "Fit Outside"); 455 efl_text_set(rd, "Fit Outside");
456 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 456 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
457 efl_event_callback_add(rd, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 457 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
458 efl_pack(hbox, rd); 458 efl_pack(hbox, rd);
459 459
460 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 460 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
461 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_NONE); 461 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_NONE);
462 efl_text_set(rd, "None"); 462 efl_text_set(rd, "None");
463 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 463 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
464 efl_event_callback_add(rd, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 464 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
465 efl_pack(hbox, rd); 465 efl_pack(hbox, rd);
466 466
467 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 467 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
468 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_TILE); 468 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_TILE);
469 efl_text_set(rd, "Tile"); 469 efl_text_set(rd, "Tile");
470 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 470 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
471 efl_event_callback_add(rd, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 471 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
472 efl_pack(hbox, rd); 472 efl_pack(hbox, rd);
473 473
474 efl_ui_radio_group_selected_value_set(hbox, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 474 efl_ui_radio_group_selected_value_set(hbox, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
@@ -476,7 +476,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
476 c = efl_add(EFL_UI_CHECK_CLASS, box); 476 c = efl_add(EFL_UI_CHECK_CLASS, box);
477 efl_text_set(c, "Bg Color"); 477 efl_text_set(c, "Bg Color");
478 efl_gfx_hint_weight_set(c, EFL_GFX_HINT_EXPAND, 0.0); 478 efl_gfx_hint_weight_set(c, EFL_GFX_HINT_EXPAND, 0.0);
479 efl_event_callback_add(c, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _cb_check_changed_scale_type, o_bg); 479 efl_event_callback_add(c, EFL_UI_EVENT_SELECTED_CHANGED, _cb_check_changed_scale_type, o_bg);
480 efl_pack(box, c); 480 efl_pack(box, c);
481 481
482 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200)); 482 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c
index 482abe6d8d..be5f26a9b7 100644
--- a/src/bin/elementary/test_ui_image.c
+++ b/src/bin/elementary/test_ui_image.c
@@ -477,8 +477,8 @@ _reload_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
477 Eo *im = efl_key_data_get(win, "im"); 477 Eo *im = efl_key_data_get(win, "im");
478 Eo *chk1 = efl_key_data_get(win, "chk1"); 478 Eo *chk1 = efl_key_data_get(win, "chk1");
479 Eo *chk2 = efl_key_data_get(win, "chk2"); 479 Eo *chk2 = efl_key_data_get(win, "chk2");
480 Eina_Bool async = efl_ui_check_selected_get(chk1); 480 Eina_Bool async = efl_ui_selectable_selected_get(chk1);
481 Eina_Bool preload = efl_ui_check_selected_get(chk2); 481 Eina_Bool preload = efl_ui_selectable_selected_get(chk2);
482 Eina_Bool logo = EINA_FALSE; 482 Eina_Bool logo = EINA_FALSE;
483 const char *file = NULL; 483 const char *file = NULL;
484 484
@@ -496,8 +496,8 @@ _switch_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
496 Eo *im = efl_key_data_get(win, "im"); 496 Eo *im = efl_key_data_get(win, "im");
497 Eo *chk1 = efl_key_data_get(win, "chk1"); 497 Eo *chk1 = efl_key_data_get(win, "chk1");
498 Eo *chk2 = efl_key_data_get(win, "chk2"); 498 Eo *chk2 = efl_key_data_get(win, "chk2");
499 Eina_Bool async = efl_ui_check_selected_get(chk1); 499 Eina_Bool async = efl_ui_selectable_selected_get(chk1);
500 Eina_Bool preload = efl_ui_check_selected_get(chk2); 500 Eina_Bool preload = efl_ui_selectable_selected_get(chk2);
501 char buf[PATH_MAX] = {0}; 501 char buf[PATH_MAX] = {0};
502 Eina_Bool logo = EINA_FALSE; 502 Eina_Bool logo = EINA_FALSE;
503 const char *file = NULL; 503 const char *file = NULL;
diff --git a/src/bin/elementary/test_ui_item_container.c b/src/bin/elementary/test_ui_item_container.c
index e1e7654e5d..ec2b2dfb8c 100644
--- a/src/bin/elementary/test_ui_item_container.c
+++ b/src/bin/elementary/test_ui_item_container.c
@@ -7,7 +7,7 @@
7static void 7static void
8_selection_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED) 8_selection_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
9{ 9{
10 if (efl_ui_check_selected_get(ev->object)) 10 if (efl_ui_selectable_selected_get(ev->object))
11 efl_ui_layout_orientation_set(data, EFL_UI_LAYOUT_ORIENTATION_VERTICAL); 11 efl_ui_layout_orientation_set(data, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
12 else 12 else
13 efl_ui_layout_orientation_set(data, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL); 13 efl_ui_layout_orientation_set(data, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
@@ -73,8 +73,8 @@ _selection_changed_match_content_cb(void *data, const Efl_Event *ev EINA_UNUSED)
73 Match_Content_Ctx *c = data; 73 Match_Content_Ctx *c = data;
74 Eina_Bool v,h; 74 Eina_Bool v,h;
75 75
76 v = efl_ui_check_selected_get(c->v); 76 v = efl_ui_selectable_selected_get(c->v);
77 h = efl_ui_check_selected_get(c->h); 77 h = efl_ui_selectable_selected_get(c->h);
78 78
79 efl_ui_scrollable_match_content_set(c->c, v, h); 79 efl_ui_scrollable_match_content_set(c->c, v, h);
80} 80}
@@ -213,15 +213,15 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
213 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 213 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
214 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 214 efl_gfx_hint_align_set(efl_added, 0, 0.5));
215 efl_text_set(o, "Vertical"); 215 efl_text_set(o, "Vertical");
216 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _selection_changed_cb, item_container); 216 efl_event_callback_add(o, EFL_UI_EVENT_SELECTED_CHANGED, _selection_changed_cb, item_container);
217 efl_ui_check_selected_set(o, EINA_TRUE); 217 efl_ui_selectable_selected_set(o, EINA_TRUE);
218 efl_pack_table(tbl, o, 0, 5, 1, 1); 218 efl_pack_table(tbl, o, 0, 5, 1, 1);
219 219
220 o = efl_add(EFL_UI_CHECK_CLASS, tbl, 220 o = efl_add(EFL_UI_CHECK_CLASS, tbl,
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, "Match Vertical"); 223 efl_text_set(o, "Match Vertical");
224 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _selection_changed_match_content_cb, ctx); 224 efl_event_callback_add(o, EFL_UI_EVENT_SELECTED_CHANGED, _selection_changed_match_content_cb, ctx);
225 efl_pack_table(tbl, o, 0, 6, 1, 1); 225 efl_pack_table(tbl, o, 0, 6, 1, 1);
226 ctx->v = o; 226 ctx->v = o;
227 227
@@ -229,7 +229,7 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
229 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 229 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
230 efl_gfx_hint_align_set(efl_added, 0, 0.5)); 230 efl_gfx_hint_align_set(efl_added, 0, 0.5));
231 efl_text_set(o, "Match Horizontal"); 231 efl_text_set(o, "Match Horizontal");
232 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _selection_changed_match_content_cb, ctx); 232 efl_event_callback_add(o, EFL_UI_EVENT_SELECTED_CHANGED, _selection_changed_match_content_cb, ctx);
233 efl_pack_table(tbl, o, 0, 7, 1, 1); 233 efl_pack_table(tbl, o, 0, 7, 1, 1);
234 efl_gfx_entity_size_set(win, EINA_SIZE2D(260, 200)); 234 efl_gfx_entity_size_set(win, EINA_SIZE2D(260, 200));
235 ctx->h = o; 235 ctx->h = o;
diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c
index c01c978b65..df9afd5ad9 100644
--- a/src/bin/elementary/test_ui_pager.c
+++ b/src/bin/elementary/test_ui_pager.c
@@ -375,7 +375,7 @@ static void page_size_cb(void *data,
375 size_params->pager = params->pager; 375 size_params->pager = params->pager;
376 size_params->params = params; 376 size_params->params = params;
377 377
378 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, width_check_cb, 378 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, width_check_cb,
379 size_params); 379 size_params);
380 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params); 380 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params);
381 381
@@ -416,7 +416,7 @@ static void page_size_cb(void *data,
416 size_params->pager = params->pager; 416 size_params->pager = params->pager;
417 size_params->params = params; 417 size_params->params = params;
418 418
419 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, height_check_cb, 419 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, height_check_cb,
420 size_params); 420 size_params);
421 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params); 421 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params);
422 422
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c
index 8112716f45..1ac37da74d 100644
--- a/src/bin/elementary/test_ui_pager_scroll.c
+++ b/src/bin/elementary/test_ui_pager_scroll.c
@@ -339,7 +339,7 @@ static void prev_block_check_cb(void *data, const Efl_Event *ev)
339 Eo *pager = data; 339 Eo *pager = data;
340 Eina_Bool prev, next; 340 Eina_Bool prev, next;
341 341
342 prev = efl_ui_check_selected_get(ev->object); 342 prev = efl_ui_selectable_selected_get(ev->object);
343 343
344 efl_ui_pager_scroll_block_get(pager, NULL, &next); 344 efl_ui_pager_scroll_block_get(pager, NULL, &next);
345 efl_ui_pager_scroll_block_set(pager, prev, next); 345 efl_ui_pager_scroll_block_set(pager, prev, next);
@@ -350,7 +350,7 @@ static void next_block_check_cb(void *data, const Efl_Event *ev)
350 Eo *pager = data; 350 Eo *pager = data;
351 Eina_Bool prev, next; 351 Eina_Bool prev, next;
352 352
353 next = efl_ui_check_selected_get(ev->object); 353 next = efl_ui_selectable_selected_get(ev->object);
354 354
355 efl_ui_pager_scroll_block_get(pager, &prev, NULL); 355 efl_ui_pager_scroll_block_get(pager, &prev, NULL);
356 efl_ui_pager_scroll_block_set(pager, prev, next); 356 efl_ui_pager_scroll_block_set(pager, prev, next);
@@ -429,7 +429,7 @@ static void page_size_cb(void *data,
429 size_params->pager = params->pager; 429 size_params->pager = params->pager;
430 size_params->params = params; 430 size_params->params = params;
431 431
432 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, width_check_cb, 432 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, width_check_cb,
433 size_params); 433 size_params);
434 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params); 434 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params);
435 435
@@ -470,7 +470,7 @@ static void page_size_cb(void *data,
470 size_params->pager = params->pager; 470 size_params->pager = params->pager;
471 size_params->params = params; 471 size_params->params = params;
472 472
473 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, height_check_cb, 473 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, height_check_cb,
474 size_params); 474 size_params);
475 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params); 475 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params);
476 476
@@ -796,16 +796,16 @@ static void scroll_block_cb(void *data,
796 c = efl_add(EFL_UI_CHECK_CLASS, box); 796 c = efl_add(EFL_UI_CHECK_CLASS, box);
797 efl_ui_widget_style_set(c, "toggle"); 797 efl_ui_widget_style_set(c, "toggle");
798 efl_text_set(c, "Prev Block"); 798 efl_text_set(c, "Prev Block");
799 efl_ui_check_selected_set(c, prev); 799 efl_ui_selectable_selected_set(c, prev);
800 efl_event_callback_add(c, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, 800 efl_event_callback_add(c, EFL_UI_EVENT_SELECTED_CHANGED,
801 prev_block_check_cb, pager); 801 prev_block_check_cb, pager);
802 efl_pack_end(box, c); 802 efl_pack_end(box, c);
803 803
804 c = efl_add(EFL_UI_CHECK_CLASS, box); 804 c = efl_add(EFL_UI_CHECK_CLASS, box);
805 efl_ui_widget_style_set(c, "toggle"); 805 efl_ui_widget_style_set(c, "toggle");
806 efl_text_set(c, "Next Block"); 806 efl_text_set(c, "Next Block");
807 efl_ui_check_selected_set(c, next); 807 efl_ui_selectable_selected_set(c, next);
808 efl_event_callback_add(c, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, 808 efl_event_callback_add(c, EFL_UI_EVENT_SELECTED_CHANGED,
809 next_block_check_cb, pager); 809 next_block_check_cb, pager);
810 efl_pack_end(box, c); 810 efl_pack_end(box, c);
811} 811}
@@ -834,7 +834,7 @@ static void loop_cb(void *data EINA_UNUSED,
834 efl_ui_radio_state_value_set(rd, EFL_UI_PAGER_LOOP_DISABLED); 834 efl_ui_radio_state_value_set(rd, EFL_UI_PAGER_LOOP_DISABLED);
835 efl_text_set(rd, "Disabled"); 835 efl_text_set(rd, "Disabled");
836 efl_gfx_hint_weight_set(rd, 1, 0); 836 efl_gfx_hint_weight_set(rd, 1, 0);
837 efl_event_callback_add(rd, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, 837 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED,
838 loop_radio_cb, pager); 838 loop_radio_cb, pager);
839 efl_pack(box, rd); 839 efl_pack(box, rd);
840 840
@@ -842,7 +842,7 @@ static void loop_cb(void *data EINA_UNUSED,
842 efl_ui_radio_state_value_set(rd, EFL_UI_PAGER_LOOP_ENABLED); 842 efl_ui_radio_state_value_set(rd, EFL_UI_PAGER_LOOP_ENABLED);
843 efl_text_set(rd, "Enabled"); 843 efl_text_set(rd, "Enabled");
844 efl_gfx_hint_weight_set(rd, 1, 0); 844 efl_gfx_hint_weight_set(rd, 1, 0);
845 efl_event_callback_add(rd, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, 845 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED,
846 loop_radio_cb, pager); 846 loop_radio_cb, pager);
847 efl_pack(box, rd); 847 efl_pack(box, rd);
848 848
diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c
index ac08ff878a..928dd2d201 100644
--- a/src/bin/elementary/test_ui_panel.c
+++ b/src/bin/elementary/test_ui_panel.c
@@ -67,7 +67,7 @@ test_ui_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
67static void 67static void
68_check_changed(void *data EINA_UNUSED, const Efl_Event *ev) 68_check_changed(void *data EINA_UNUSED, const Efl_Event *ev)
69{ 69{
70 elm_config_scroll_thumbscroll_enabled_set(efl_ui_check_selected_get(ev->object)); 70 elm_config_scroll_thumbscroll_enabled_set(efl_ui_selectable_selected_get(ev->object));
71} 71}
72 72
73static void 73static void
@@ -76,7 +76,7 @@ _panel_toggled(void *data, const Efl_Event *ev)
76 Evas_Object *list; 76 Evas_Object *list;
77 int i; 77 int i;
78 78
79 if (!efl_ui_check_selected_get(data)) return; 79 if (!efl_ui_selectable_selected_get(data)) return;
80 80
81 list = efl_content_get(ev->object); 81 list = efl_content_get(ev->object);
82 evas_object_del(list); 82 evas_object_del(list);
@@ -112,9 +112,9 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
112 efl_content_set(win, efl_added)); 112 efl_content_set(win, efl_added));
113 113
114 check = efl_add(EFL_UI_CHECK_CLASS, box); 114 check = efl_add(EFL_UI_CHECK_CLASS, box);
115 efl_ui_check_selected_set(check, elm_config_scroll_thumbscroll_enabled_get()); 115 efl_ui_selectable_selected_set(check, elm_config_scroll_thumbscroll_enabled_get());
116 efl_text_set(check, "Enable thumb scroll (temporarily"); 116 efl_text_set(check, "Enable thumb scroll (temporarily");
117 efl_event_callback_add(check, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _check_changed, NULL); 117 efl_event_callback_add(check, EFL_UI_EVENT_SELECTED_CHANGED, _check_changed, NULL);
118 efl_gfx_hint_weight_set(check, EVAS_HINT_EXPAND, 0); 118 efl_gfx_hint_weight_set(check, EVAS_HINT_EXPAND, 0);
119 efl_pack(box, check); 119 efl_pack(box, check);
120 120
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c
index 943c57404a..016c5307a9 100644
--- a/src/bin/elementary/test_ui_progressbar.c
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -137,7 +137,7 @@ _toggle_progress_label(void *data, const Efl_Event *ev)
137{ 137{
138 Efl_Ui_Check *check = ev->object; 138 Efl_Ui_Check *check = ev->object;
139 Efl_Ui_Progressbar *pb3 = data; 139 Efl_Ui_Progressbar *pb3 = data;
140 Eina_Bool state = efl_ui_check_selected_get(check); 140 Eina_Bool state = efl_ui_selectable_selected_get(check);
141 141
142 efl_ui_progressbar_show_progress_label_set(pb3, state); 142 efl_ui_progressbar_show_progress_label_set(pb3, state);
143} 143}
@@ -195,7 +195,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
195 ); 195 );
196 pd->check = efl_add(EFL_UI_CHECK_CLASS, bx, 196 pd->check = efl_add(EFL_UI_CHECK_CLASS, bx,
197 efl_pack(bx, efl_added), 197 efl_pack(bx, efl_added),
198 efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, 198 efl_event_callback_add(efl_added, EFL_UI_EVENT_SELECTED_CHANGED,
199 _toggle_progress_label, pd->pb3), 199 _toggle_progress_label, pd->pb3),
200 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)) 200 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20))
201 ); 201 );
diff --git a/src/bin/elementary/test_ui_radio.c b/src/bin/elementary/test_ui_radio.c
index c6cb3d2033..ec2740f9cb 100644
--- a/src/bin/elementary/test_ui_radio.c
+++ b/src/bin/elementary/test_ui_radio.c
@@ -20,7 +20,7 @@ const char *countries[] =
20static void 20static void
21_check_button_selection_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev) 21_check_button_selection_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
22{ 22{
23 if (efl_ui_check_selected_get(ev->object)) 23 if (efl_ui_selectable_selected_get(ev->object))
24 printf("Object %p is now selected\n", ev->object); 24 printf("Object %p is now selected\n", ev->object);
25 else 25 else
26 printf("Object %p is now unselected\n", ev->object); 26 printf("Object %p is now unselected\n", ev->object);
@@ -36,7 +36,7 @@ create_radios(Efl_Ui_Win *win)
36 Efl_Ui_Radio *rbtn = efl_add(EFL_UI_RADIO_CLASS, win); 36 Efl_Ui_Radio *rbtn = efl_add(EFL_UI_RADIO_CLASS, win);
37 efl_ui_radio_state_value_set(rbtn, i); 37 efl_ui_radio_state_value_set(rbtn, i);
38 efl_text_set(rbtn, countries[i]); 38 efl_text_set(rbtn, countries[i]);
39 efl_event_callback_add(rbtn, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _check_button_selection_changed_cb, NULL); 39 efl_event_callback_add(rbtn, EFL_UI_EVENT_SELECTED_CHANGED, _check_button_selection_changed_cb, NULL);
40 eina_array_push(arr, rbtn); 40 eina_array_push(arr, rbtn);
41 } 41 }
42 42
@@ -65,7 +65,7 @@ _select_btn_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
65{ 65{
66 Efl_Ui_Check *c = data; 66 Efl_Ui_Check *c = data;
67 67
68 efl_ui_check_selected_set(c, EINA_TRUE); 68 efl_ui_selectable_selected_set(c, EINA_TRUE);
69} 69}
70 70
71static void 71static void
diff --git a/src/bin/elementary/test_ui_spotlight.c b/src/bin/elementary/test_ui_spotlight.c
index 4b81f8acfb..03485dda15 100644
--- a/src/bin/elementary/test_ui_spotlight.c
+++ b/src/bin/elementary/test_ui_spotlight.c
@@ -459,7 +459,7 @@ spotlight_size(void *data,
459 size_params->spotlight = params->spotlight; 459 size_params->spotlight = params->spotlight;
460 size_params->params = params; 460 size_params->params = params;
461 461
462 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, width_check_cb, 462 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, width_check_cb,
463 size_params); 463 size_params);
464 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params); 464 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params);
465 465
@@ -500,7 +500,7 @@ spotlight_size(void *data,
500 size_params->spotlight = params->spotlight; 500 size_params->spotlight = params->spotlight;
501 size_params->params = params; 501 size_params->params = params;
502 502
503 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, height_check_cb, 503 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, height_check_cb,
504 size_params); 504 size_params);
505 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params); 505 efl_event_callback_add(ck, EFL_EVENT_DEL, check_del_cb, size_params);
506 506
@@ -516,7 +516,7 @@ _animation_cb(void *data, const Efl_Event *ev)
516{ 516{
517 Params *params = data; 517 Params *params = data;
518 518
519 efl_ui_spotlight_manager_animation_enabled_set(efl_ui_spotlight_manager_get(params->spotlight), efl_ui_check_selected_get(ev->object)); 519 efl_ui_spotlight_manager_animation_enabled_set(efl_ui_spotlight_manager_get(params->spotlight), efl_ui_selectable_selected_get(ev->object));
520} 520}
521 521
522static void 522static void
@@ -538,8 +538,8 @@ view_animation_cb(void *data,
538 efl_added, NULL)); 538 efl_added, NULL));
539 539
540 ck = efl_add(EFL_UI_CHECK_CLASS, box); 540 ck = efl_add(EFL_UI_CHECK_CLASS, box);
541 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _animation_cb, params); 541 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, _animation_cb, params);
542 efl_ui_check_selected_set(ck, efl_ui_spotlight_manager_animation_enabled_get(efl_ui_spotlight_manager_get(params->spotlight))); 542 efl_ui_selectable_selected_set(ck, efl_ui_spotlight_manager_animation_enabled_get(efl_ui_spotlight_manager_get(params->spotlight)));
543 efl_text_set(ck, "Animation"); 543 efl_text_set(ck, "Animation");
544 efl_pack_end(box, ck); 544 efl_pack_end(box, ck);
545 efl_gfx_entity_visible_set(ck, 1); 545 efl_gfx_entity_visible_set(ck, 1);
@@ -550,7 +550,7 @@ _scroll_block_check_cb(void *data, const Efl_Event *ev)
550{ 550{
551 Params *params = data; 551 Params *params = data;
552 552
553 efl_ui_spotlight_manager_scroll_block_set(efl_ui_spotlight_manager_get(params->spotlight), efl_ui_check_selected_get(ev->object)); 553 efl_ui_spotlight_manager_scroll_block_set(efl_ui_spotlight_manager_get(params->spotlight), efl_ui_selectable_selected_get(ev->object));
554} 554}
555 555
556static void 556static void
@@ -572,8 +572,8 @@ scroll_block_cb(void *data,
572 efl_added, NULL)); 572 efl_added, NULL));
573 573
574 ck = efl_add(EFL_UI_CHECK_CLASS, box); 574 ck = efl_add(EFL_UI_CHECK_CLASS, box);
575 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _scroll_block_check_cb, params); 575 efl_event_callback_add(ck, EFL_UI_EVENT_SELECTED_CHANGED, _scroll_block_check_cb, params);
576 efl_ui_check_selected_set(ck, efl_ui_spotlight_manager_scroll_block_get(efl_ui_spotlight_manager_get(params->spotlight))); 576 efl_ui_selectable_selected_set(ck, efl_ui_spotlight_manager_scroll_block_get(efl_ui_spotlight_manager_get(params->spotlight)));
577 efl_text_set(ck, "Scroll Block"); 577 efl_text_set(ck, "Scroll Block");
578 efl_pack_end(box, ck); 578 efl_pack_end(box, ck);
579 efl_gfx_entity_visible_set(ck, 1); 579 efl_gfx_entity_visible_set(ck, 1);
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index c7180a555e..df8a4c0c6e 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -491,7 +491,7 @@ _change_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
491 cur = efl_ui_spotlight_active_index_get(tcd->tab_pager); 491 cur = efl_ui_spotlight_active_index_get(tcd->tab_pager);
492 tab_page = efl_pack_content_get(tcd->tab_pager, cur); 492 tab_page = efl_pack_content_get(tcd->tab_pager, cur);
493 493
494 if (efl_ui_check_selected_get(tcd->label_check)) 494 if (efl_ui_selectable_selected_get(tcd->label_check))
495 { 495 {
496 label = tab_label_get(); 496 label = tab_label_get();
497 efl_text_set(efl_part(tab_page, "tab"), label); 497 efl_text_set(efl_part(tab_page, "tab"), label);
@@ -499,7 +499,7 @@ _change_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
499 efl_content_set(tab_page, content); 499 efl_content_set(tab_page, content);
500 } 500 }
501 501
502 if (efl_ui_check_selected_get(tcd->icon_check)) 502 if (efl_ui_selectable_selected_get(tcd->icon_check))
503 { 503 {
504 icon = tab_icon_get(); 504 icon = tab_icon_get();
505 efl_ui_tab_page_part_tab_icon_set(efl_part(tab_page, "tab"), icon); 505 efl_ui_tab_page_part_tab_icon_set(efl_part(tab_page, "tab"), icon);
@@ -534,12 +534,12 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
534 534
535 label_check = efl_add(EFL_UI_CHECK_CLASS, box); 535 label_check = efl_add(EFL_UI_CHECK_CLASS, box);
536 efl_text_set(label_check, "Tab Label + Page"); 536 efl_text_set(label_check, "Tab Label + Page");
537 efl_ui_check_selected_set(label_check, EINA_FALSE); 537 efl_ui_selectable_selected_set(label_check, EINA_FALSE);
538 efl_pack_end(box, label_check); 538 efl_pack_end(box, label_check);
539 539
540 icon_check = efl_add(EFL_UI_CHECK_CLASS, box); 540 icon_check = efl_add(EFL_UI_CHECK_CLASS, box);
541 efl_text_set(icon_check, "Tab Icon"); 541 efl_text_set(icon_check, "Tab Icon");
542 efl_ui_check_selected_set(icon_check, EINA_FALSE); 542 efl_ui_selectable_selected_set(icon_check, EINA_FALSE);
543 efl_pack_end(box, icon_check); 543 efl_pack_end(box, icon_check);
544 544
545 tcd->tab_pager = tab_pager; 545 tcd->tab_pager = tab_pager;
diff --git a/src/bin/elementary/test_ui_textpath.c b/src/bin/elementary/test_ui_textpath.c
index 8c27688ea0..40317a9627 100644
--- a/src/bin/elementary/test_ui_textpath.c
+++ b/src/bin/elementary/test_ui_textpath.c
@@ -121,20 +121,20 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
121 chk = efl_add(EFL_UI_CHECK_CLASS, win); 121 chk = efl_add(EFL_UI_CHECK_CLASS, win);
122 efl_text_set(chk, "Ellipsis"); 122 efl_text_set(chk, "Ellipsis");
123 elm_check_state_set(chk, efl_ui_textpath_ellipsis_get(txtpath)); 123 elm_check_state_set(chk, efl_ui_textpath_ellipsis_get(txtpath));
124 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _ellipsis_changed_cb, txtpath); 124 efl_event_callback_add(chk, EFL_UI_EVENT_SELECTED_CHANGED, _ellipsis_changed_cb, txtpath);
125 elm_box_pack_end(hbox, chk); 125 elm_box_pack_end(hbox, chk);
126 efl_gfx_entity_visible_set(chk, EINA_TRUE); 126 efl_gfx_entity_visible_set(chk, EINA_TRUE);
127 127
128 chk = efl_add(EFL_UI_CHECK_CLASS, win); 128 chk = efl_add(EFL_UI_CHECK_CLASS, win);
129 efl_text_set(chk, "Clockwise"); 129 efl_text_set(chk, "Clockwise");
130 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _direction_changed_cb, txtpath); 130 efl_event_callback_add(chk, EFL_UI_EVENT_SELECTED_CHANGED, _direction_changed_cb, txtpath);
131 elm_box_pack_end(hbox, chk); 131 elm_box_pack_end(hbox, chk);
132 efl_gfx_entity_visible_set(chk, EINA_TRUE); 132 efl_gfx_entity_visible_set(chk, EINA_TRUE);
133 dir_chk = chk; 133 dir_chk = chk;
134 134
135 chk = efl_add(EFL_UI_CHECK_CLASS, win); 135 chk = efl_add(EFL_UI_CHECK_CLASS, win);
136 efl_text_set(chk, "Short text"); 136 efl_text_set(chk, "Short text");
137 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _short_text_changed_cb, txtpath); 137 efl_event_callback_add(chk, EFL_UI_EVENT_SELECTED_CHANGED, _short_text_changed_cb, txtpath);
138 elm_box_pack_end(hbox, chk); 138 elm_box_pack_end(hbox, chk);
139 efl_gfx_entity_visible_set(chk, EINA_TRUE); 139 efl_gfx_entity_visible_set(chk, EINA_TRUE);
140 140