summaryrefslogtreecommitdiff
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
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
-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
-rw-r--r--src/lib/elementary/efl_ui_check.c32
-rw-r--r--src/lib/elementary/efl_ui_check.eo16
-rw-r--r--src/lib/elementary/efl_ui_check_eo.legacy.c4
-rw-r--r--src/lib/elementary/efl_ui_radio.c36
-rw-r--r--src/lib/elementary/efl_ui_radio.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio_group_impl.c8
-rw-r--r--src/tests/elementary/efl_ui_test_check.c22
-rw-r--r--src/tests/elementary/efl_ui_test_radio_group.c22
19 files changed, 119 insertions, 131 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
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index fd562191e0..43b2a967f6 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -54,13 +54,13 @@ static void
54_activate(Evas_Object *obj) 54_activate(Evas_Object *obj)
55{ 55{
56 // state will be changed by the later call to the selected_set call 56 // state will be changed by the later call to the selected_set call
57 if (!efl_ui_check_selected_get(obj)) 57 if (!efl_ui_selectable_selected_get(obj))
58 { 58 {
59 // FIXME: to do animation during state change , we need different signal 59 // FIXME: to do animation during state change , we need different signal
60 // so that we can distinguish between state change by user or state change 60 // so that we can distinguish between state change by user or state change
61 // by calling state_change() api. Keep both the signal for backward compatibility 61 // by calling state_change() api. Keep both the signal for backward compatibility
62 // and remove "elm,state,check,on" signal emission when we can break ABI. 62 // and remove "elm,state,check,on" signal emission when we can break ABI.
63 // efl_ui_check_selected_set below will emit "elm,state,check,*" or "efl,state,check,*" 63 // efl_ui_selectable_selected_set below will emit "elm,state,check,*" or "efl,state,check,*"
64 if (elm_widget_is_legacy(obj)) 64 if (elm_widget_is_legacy(obj))
65 { 65 {
66 elm_layout_signal_emit(obj, "elm,activate,check,on", "elm"); 66 elm_layout_signal_emit(obj, "elm,activate,check,on", "elm");
@@ -79,7 +79,7 @@ _activate(Evas_Object *obj)
79 // so that we can distinguish between state change by user or state change 79 // so that we can distinguish between state change by user or state change
80 // by calling state_change() api. Keep both the signal for backward compatibility 80 // by calling state_change() api. Keep both the signal for backward compatibility
81 // and remove "elm,state,check,off" signal emission when we can break ABI. 81 // and remove "elm,state,check,off" signal emission when we can break ABI.
82 // efl_ui_check_selected_set below will emit "elm,state,check,*" or "efl,state,check,*" 82 // efl_ui_selectable_selected_set below will emit "elm,state,check,*" or "efl,state,check,*"
83 if (elm_widget_is_legacy(obj)) 83 if (elm_widget_is_legacy(obj))
84 { 84 {
85 elm_layout_signal_emit(obj, "elm,activate,check,off", "elm"); 85 elm_layout_signal_emit(obj, "elm,activate,check,off", "elm");
@@ -95,14 +95,14 @@ _activate(Evas_Object *obj)
95 //This commit will update the theme with the correct signals 95 //This commit will update the theme with the correct signals
96 // "elm,state,check,on" or "elm,state,check,off" for legacy 96 // "elm,state,check,on" or "elm,state,check,off" for legacy
97 // "efl,state,check,on" or "efl,state,check,off" for eo-api 97 // "efl,state,check,on" or "efl,state,check,off" for eo-api
98 efl_ui_check_selected_set(obj, !efl_ui_check_selected_get(obj)); 98 efl_ui_selectable_selected_set(obj, !efl_ui_selectable_selected_get(obj));
99 if (elm_widget_is_legacy(obj)) 99 if (elm_widget_is_legacy(obj))
100 evas_object_smart_callback_call(obj, "changed", NULL); 100 evas_object_smart_callback_call(obj, "changed", NULL);
101 101
102 if (_elm_config->atspi_mode) 102 if (_elm_config->atspi_mode)
103 efl_access_state_changed_signal_emit(obj, 103 efl_access_state_changed_signal_emit(obj,
104 EFL_ACCESS_STATE_TYPE_CHECKED, 104 EFL_ACCESS_STATE_TYPE_CHECKED,
105 efl_ui_check_selected_get(obj)); 105 efl_ui_selectable_selected_get(obj));
106} 106}
107 107
108EOLIAN static Efl_Access_State_Set 108EOLIAN static Efl_Access_State_Set
@@ -148,14 +148,14 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS
148 148
149 if (elm_widget_is_legacy(obj)) 149 if (elm_widget_is_legacy(obj))
150 { 150 {
151 if (!efl_ui_check_selected_get(obj)) 151 if (!efl_ui_selectable_selected_get(obj))
152 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 152 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
153 else 153 else
154 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 154 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
155 } 155 }
156 else 156 else
157 { 157 {
158 if (!efl_ui_check_selected_get(obj)) 158 if (!efl_ui_selectable_selected_get(obj))
159 elm_layout_signal_emit(obj, "efl,state,check,off", "efl"); 159 elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
160 else 160 else
161 elm_layout_signal_emit(obj, "efl,state,check,on", "efl"); 161 elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
@@ -184,7 +184,7 @@ _access_state_cb(void *data, Evas_Object *obj)
184 184
185 if (elm_widget_disabled_get(obj)) 185 if (elm_widget_disabled_get(obj))
186 return strdup(E_("State: Disabled")); 186 return strdup(E_("State: Disabled"));
187 if (efl_ui_check_selected_get(obj)) 187 if (efl_ui_selectable_selected_get(obj))
188 { 188 {
189 on_text = elm_layout_text_get(data, "on"); 189 on_text = elm_layout_text_get(data, "on");
190 190
@@ -214,12 +214,12 @@ _access_state_cb(void *data, Evas_Object *obj)
214static void 214static void
215_flush_selected(Eo *obj, Eina_Bool sel) 215_flush_selected(Eo *obj, Eina_Bool sel)
216{ 216{
217 efl_ui_check_selected_set(obj, sel); 217 efl_ui_selectable_selected_set(obj, sel);
218 218
219 if (_elm_config->atspi_mode) 219 if (_elm_config->atspi_mode)
220 efl_access_state_changed_signal_emit(obj, 220 efl_access_state_changed_signal_emit(obj,
221 EFL_ACCESS_STATE_TYPE_CHECKED, 221 EFL_ACCESS_STATE_TYPE_CHECKED,
222 efl_ui_check_selected_get(obj)); 222 efl_ui_selectable_selected_get(obj));
223} 223}
224 224
225static void 225static void
@@ -260,13 +260,13 @@ _clicked_cb(void *data, const Efl_Event *ev EINA_UNUSED)
260} 260}
261 261
262EOLIAN static Eina_Bool 262EOLIAN static Eina_Bool
263_efl_ui_check_selected_get(const Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED) 263_efl_ui_check_efl_ui_selectable_selected_get(const Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED)
264{ 264{
265 return pd->selected; 265 return pd->selected;
266} 266}
267 267
268EOLIAN static void 268EOLIAN static void
269_efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *pd, Eina_Bool value) 269_efl_ui_check_efl_ui_selectable_selected_set(Eo *obj, Efl_Ui_Check_Data *pd, Eina_Bool value)
270{ 270{
271 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 271 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
272 272
@@ -298,7 +298,7 @@ _efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *pd, Eina_Bool value)
298 pd->selected = value; 298 pd->selected = value;
299 299
300 if (!elm_widget_is_legacy(obj)) 300 if (!elm_widget_is_legacy(obj))
301 efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, &pd->selected); 301 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED_CHANGED, &pd->selected);
302} 302}
303 303
304EOLIAN static Eo * 304EOLIAN static Eo *
@@ -349,13 +349,13 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
349 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 349 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
350 EFL_UI_CHECK_DATA_GET_OR_RETURN(obj, sd); 350 EFL_UI_CHECK_DATA_GET_OR_RETURN(obj, sd);
351 351
352 efl_ui_check_selected_set(obj, state); 352 efl_ui_selectable_selected_set(obj, state);
353} 353}
354 354
355EAPI Eina_Bool 355EAPI Eina_Bool
356elm_check_state_get(const Evas_Object *obj) 356elm_check_state_get(const Evas_Object *obj)
357{ 357{
358 return !!efl_ui_check_selected_get(obj); 358 return !!efl_ui_selectable_selected_get(obj);
359} 359}
360 360
361EAPI void 361EAPI void
@@ -372,7 +372,7 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
372 sd->statep = statep; 372 sd->statep = statep;
373 if (*sd->statep != sd->selected) 373 if (*sd->statep != sd->selected)
374 { 374 {
375 efl_ui_check_selected_set(obj, *sd->statep); 375 efl_ui_selectable_selected_set(obj, *sd->statep);
376 } 376 }
377} 377}
378 378
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index b1571ca203..d3f6a39a42 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Text, Efl.Content, Efl.Input.Clickable 1class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Text, Efl.Content, Efl.Input.Clickable, Efl.Ui.Selectable
2{ 2{
3 [[Check widget 3 [[Check widget
4 4
@@ -8,16 +8,6 @@ class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget
8 the value of a boolean between false and true. 8 the value of a boolean between false and true.
9 ]] 9 ]]
10 methods { 10 methods {
11 @property selected {
12 [[The on/off state of the check object.]]
13 set {
14 }
15 get {
16 }
17 values {
18 value: bool; [[$true if the check object is selected, $false otherwise]]
19 }
20 }
21 } 11 }
22 implements { 12 implements {
23 Efl.Object.constructor; 13 Efl.Object.constructor;
@@ -30,8 +20,6 @@ class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget
30 Efl.Content.content_unset; 20 Efl.Content.content_unset;
31 Efl.Text.text { get; set; } 21 Efl.Text.text { get; set; }
32 Efl.Ui.L10n.l10n_text { get; set; } 22 Efl.Ui.L10n.l10n_text { get; set; }
33 } 23 Efl.Ui.Selectable.selected {get; set; }
34 events {
35 selected,changed : bool; [[Emitted each time selected has changed]]
36 } 24 }
37} 25}
diff --git a/src/lib/elementary/efl_ui_check_eo.legacy.c b/src/lib/elementary/efl_ui_check_eo.legacy.c
index ea58cc9249..b2537c053a 100644
--- a/src/lib/elementary/efl_ui_check_eo.legacy.c
+++ b/src/lib/elementary/efl_ui_check_eo.legacy.c
@@ -2,11 +2,11 @@
2EAPI void 2EAPI void
3elm_check_selected_set(Efl_Ui_Check *obj, Eina_Bool value) 3elm_check_selected_set(Efl_Ui_Check *obj, Eina_Bool value)
4{ 4{
5 efl_ui_check_selected_set(obj, value); 5 efl_ui_selectable_selected_set(obj, value);
6} 6}
7 7
8EAPI Eina_Bool 8EAPI Eina_Bool
9elm_check_selected_get(const Efl_Ui_Check *obj) 9elm_check_selected_get(const Efl_Ui_Check *obj)
10{ 10{
11 return efl_ui_check_selected_get(obj); 11 return efl_ui_selectable_selected_get(obj);
12} 12}
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 5458db7f5b..a7106a3643 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -53,7 +53,7 @@ _radio_widget_signal_emit(Evas_Object *obj, const char *middle_term)
53 else 53 else
54 source = "efl"; 54 source = "efl";
55 55
56 if (efl_ui_check_selected_get(obj)) 56 if (efl_ui_selectable_selected_get(obj))
57 state = "on"; 57 state = "on";
58 else 58 else
59 state = "off"; 59 state = "off";
@@ -63,16 +63,16 @@ _radio_widget_signal_emit(Evas_Object *obj, const char *middle_term)
63} 63}
64 64
65static void 65static void
66_efl_ui_radio_efl_ui_check_selected_set(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED, Eina_Bool value) 66_efl_ui_radio_efl_ui_selectable_selected_set(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED, Eina_Bool value)
67{ 67{
68 if (value == efl_ui_check_selected_get(obj)) return; 68 if (value == efl_ui_selectable_selected_get(obj)) return;
69 efl_ui_check_selected_set(efl_super(obj, MY_CLASS), value); 69 efl_ui_selectable_selected_set(efl_super(obj, MY_CLASS), value);
70 70
71 _radio_widget_signal_emit(obj, "state,radio"); 71 _radio_widget_signal_emit(obj, "state,radio");
72 72
73 if (_elm_config->atspi_mode) 73 if (_elm_config->atspi_mode)
74 { 74 {
75 if (efl_ui_check_selected_get(obj)) 75 if (efl_ui_selectable_selected_get(obj))
76 { 76 {
77 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_CHECKED, EINA_TRUE); 77 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_CHECKED, EINA_TRUE);
78 } 78 }
@@ -97,24 +97,24 @@ _state_set_all(Efl_Ui_Radio_Data *sd, Eina_Bool activate)
97 { 97 {
98 ELM_RADIO_DATA_GET(child, sdc); 98 ELM_RADIO_DATA_GET(child, sdc);
99 99
100 if (efl_ui_check_selected_get(child)) selected = child; 100 if (efl_ui_selectable_selected_get(child)) selected = child;
101 if (sdc->value == sd->group->value) 101 if (sdc->value == sd->group->value)
102 { 102 {
103 if (activate) _activate_state_emit(child); 103 if (activate) _activate_state_emit(child);
104 efl_ui_check_selected_set(child, EINA_TRUE); 104 efl_ui_selectable_selected_set(child, EINA_TRUE);
105 if (!efl_ui_check_selected_get(child)) disabled = EINA_TRUE; 105 if (!efl_ui_selectable_selected_get(child)) disabled = EINA_TRUE;
106 } 106 }
107 else 107 else
108 { 108 {
109 if (activate) _activate_state_emit(child); 109 if (activate) _activate_state_emit(child);
110 efl_ui_check_selected_set(child, EINA_FALSE); 110 efl_ui_selectable_selected_set(child, EINA_FALSE);
111 } 111 }
112 } 112 }
113 113
114 if ((disabled) && (selected)) 114 if ((disabled) && (selected))
115 { 115 {
116 if (activate) _activate_state_emit(selected); 116 if (activate) _activate_state_emit(selected);
117 efl_ui_check_selected_set(selected, EINA_TRUE); 117 efl_ui_selectable_selected_set(selected, EINA_TRUE);
118 } 118 }
119} 119}
120 120
@@ -144,7 +144,7 @@ _activate(Evas_Object *obj)
144 else 144 else
145 { 145 {
146 //in new API, we just toggle the state of the widget, rest will be automatically handled 146 //in new API, we just toggle the state of the widget, rest will be automatically handled
147 efl_ui_check_selected_set(obj, !efl_ui_check_selected_get(obj)); 147 efl_ui_selectable_selected_set(obj, !efl_ui_selectable_selected_get(obj));
148 } 148 }
149} 149}
150 150
@@ -165,12 +165,12 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd EINA_UNUS
165 165
166 if (elm_widget_is_legacy(obj)) 166 if (elm_widget_is_legacy(obj))
167 { 167 {
168 if (efl_ui_check_selected_get(obj)) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); 168 if (efl_ui_selectable_selected_get(obj)) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
169 else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm"); 169 else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
170 } 170 }
171 else 171 else
172 { 172 {
173 if (efl_ui_check_selected_get(obj)) elm_layout_signal_emit(obj, "efl,state,radio,on", "efl"); 173 if (efl_ui_selectable_selected_get(obj)) elm_layout_signal_emit(obj, "efl,state,radio,on", "efl");
174 else elm_layout_signal_emit(obj, "efl,state,radio,off", "efl"); 174 else elm_layout_signal_emit(obj, "efl,state,radio,off", "efl");
175 } 175 }
176 176
@@ -203,7 +203,7 @@ static char *
203_access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) 203_access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
204{ 204{
205 if (elm_widget_disabled_get(obj)) return strdup(E_("State: Disabled")); 205 if (elm_widget_disabled_get(obj)) return strdup(E_("State: Disabled"));
206 if (efl_ui_check_selected_get(obj)) return strdup(E_("State: On")); 206 if (efl_ui_selectable_selected_get(obj)) return strdup(E_("State: On"));
207 207
208 return strdup(E_("State: Off")); 208 return strdup(E_("State: Off"));
209} 209}
@@ -259,8 +259,8 @@ _efl_ui_radio_state_value_set(Eo *obj, Efl_Ui_Radio_Data *sd, int value)
259 sd->value = value; 259 sd->value = value;
260 if (elm_widget_is_legacy(obj)) 260 if (elm_widget_is_legacy(obj))
261 { 261 {
262 if (sd->value == sd->group->value) efl_ui_check_selected_set(obj, EINA_TRUE); 262 if (sd->value == sd->group->value) efl_ui_selectable_selected_set(obj, EINA_TRUE);
263 else efl_ui_check_selected_set(obj, EINA_FALSE); 263 else efl_ui_selectable_selected_set(obj, EINA_FALSE);
264 } 264 }
265} 265}
266 266
@@ -504,8 +504,8 @@ elm_radio_group_add(Efl_Ui_Radio *obj, Efl_Ui_Radio *group)
504 sd->group = sdg->group; 504 sd->group = sdg->group;
505 sd->group->radios = eina_list_append(sd->group->radios, obj); 505 sd->group->radios = eina_list_append(sd->group->radios, obj);
506 } 506 }
507 if (sd->value == sd->group->value) efl_ui_check_selected_set(obj, EINA_TRUE); 507 if (sd->value == sd->group->value) efl_ui_selectable_selected_set(obj, EINA_TRUE);
508 else efl_ui_check_selected_set(obj, EINA_FALSE); 508 else efl_ui_selectable_selected_set(obj, EINA_FALSE);
509} 509}
510 510
511#include "efl_ui_radio_legacy_eo.c" 511#include "efl_ui_radio_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo
index a19e42da61..061573948b 100644
--- a/src/lib/elementary/efl_ui_radio.eo
+++ b/src/lib/elementary/efl_ui_radio.eo
@@ -41,6 +41,6 @@ class @beta Efl.Ui.Radio extends Efl.Ui.Check implements Efl.Access.Widget.Actio
41 Efl.Ui.Widget.widget_input_event_handler; 41 Efl.Ui.Widget.widget_input_event_handler;
42 Efl.Access.Object.state_set { get; } 42 Efl.Access.Object.state_set { get; }
43 Efl.Access.Widget.Action.elm_actions { get; } 43 Efl.Access.Widget.Action.elm_actions { get; }
44 Efl.Ui.Check.selected {set;} 44 Efl.Ui.Selectable.selected {set;}
45 } 45 }
46} 46}
diff --git a/src/lib/elementary/efl_ui_radio_group_impl.c b/src/lib/elementary/efl_ui_radio_group_impl.c
index 4e68299540..14dc5a4af6 100644
--- a/src/lib/elementary/efl_ui_radio_group_impl.c
+++ b/src/lib/elementary/efl_ui_radio_group_impl.c
@@ -28,11 +28,11 @@ _efl_ui_radio_group_impl_efl_ui_radio_group_selected_object_set(Eo *obj EINA_UNU
28 //it is essential to *first* set pd->selected to the new state before calling this 28 //it is essential to *first* set pd->selected to the new state before calling this
29 //otherwise this here will be called again, and the event will get emitted twice 29 //otherwise this here will be called again, and the event will get emitted twice
30 if (old_selected && efl_alive_get(old_selected)) 30 if (old_selected && efl_alive_get(old_selected))
31 efl_ui_check_selected_set(old_selected, EINA_FALSE); 31 efl_ui_selectable_selected_set(old_selected, EINA_FALSE);
32 32
33 if (pd->selected) 33 if (pd->selected)
34 { 34 {
35 efl_ui_check_selected_set(pd->selected, EINA_TRUE); 35 efl_ui_selectable_selected_set(pd->selected, EINA_TRUE);
36 new_value = efl_ui_radio_state_value_get(pd->selected); 36 new_value = efl_ui_radio_state_value_get(pd->selected);
37 } 37 }
38 efl_event_callback_call(obj, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, &new_value); 38 efl_event_callback_call(obj, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, &new_value);
@@ -70,7 +70,7 @@ _efl_ui_radio_group_impl_efl_ui_radio_group_selected_value_get(const Eo *obj EIN
70static void 70static void
71_selected_cb(void *data, const Efl_Event *ev) 71_selected_cb(void *data, const Efl_Event *ev)
72{ 72{
73 if (efl_ui_check_selected_get(ev->object)) 73 if (efl_ui_selectable_selected_get(ev->object))
74 { 74 {
75 efl_ui_radio_group_selected_object_set(data, ev->object); 75 efl_ui_radio_group_selected_object_set(data, ev->object);
76 } 76 }
@@ -91,7 +91,7 @@ _invalidate_cb(void *data, const Efl_Event *ev)
91} 91}
92 92
93EFL_CALLBACKS_ARRAY_DEFINE(radio_btn_cb, 93EFL_CALLBACKS_ARRAY_DEFINE(radio_btn_cb,
94 {EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _selected_cb}, 94 {EFL_UI_EVENT_SELECTED_CHANGED, _selected_cb},
95 {EFL_EVENT_INVALIDATE, _invalidate_cb}, 95 {EFL_EVENT_INVALIDATE, _invalidate_cb},
96) 96)
97 97
diff --git a/src/tests/elementary/efl_ui_test_check.c b/src/tests/elementary/efl_ui_test_check.c
index bd38aa1e8e..232bc7cae5 100644
--- a/src/tests/elementary/efl_ui_test_check.c
+++ b/src/tests/elementary/efl_ui_test_check.c
@@ -36,16 +36,16 @@ EFL_END_TEST
36 36
37EFL_START_TEST(check_selection_state) 37EFL_START_TEST(check_selection_state)
38{ 38{
39 efl_ui_check_selected_set(check, EINA_TRUE); 39 efl_ui_selectable_selected_set(check, EINA_TRUE);
40 ck_assert_int_eq(efl_ui_check_selected_get(check), EINA_TRUE); 40 ck_assert_int_eq(efl_ui_selectable_selected_get(check), EINA_TRUE);
41 efl_ui_check_selected_set(check, EINA_TRUE); 41 efl_ui_selectable_selected_set(check, EINA_TRUE);
42 ck_assert_int_eq(efl_ui_check_selected_get(check), EINA_TRUE); 42 ck_assert_int_eq(efl_ui_selectable_selected_get(check), EINA_TRUE);
43 //TODO verify that signals can be emitted 43 //TODO verify that signals can be emitted
44 44
45 efl_ui_check_selected_set(check, EINA_FALSE); 45 efl_ui_selectable_selected_set(check, EINA_FALSE);
46 ck_assert_int_eq(efl_ui_check_selected_get(check), EINA_FALSE); 46 ck_assert_int_eq(efl_ui_selectable_selected_get(check), EINA_FALSE);
47 efl_ui_check_selected_set(check, EINA_FALSE); 47 efl_ui_selectable_selected_set(check, EINA_FALSE);
48 ck_assert_int_eq(efl_ui_check_selected_get(check), EINA_FALSE); 48 ck_assert_int_eq(efl_ui_selectable_selected_get(check), EINA_FALSE);
49 //TODO verify that signals can be emitted 49 //TODO verify that signals can be emitted
50} 50}
51EFL_END_TEST 51EFL_END_TEST
@@ -62,10 +62,10 @@ EFL_START_TEST(check_selection_events)
62{ 62{
63 Eina_Bool bool_event_info = EINA_FALSE; 63 Eina_Bool bool_event_info = EINA_FALSE;
64 64
65 efl_event_callback_add(check, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _check, &bool_event_info); 65 efl_event_callback_add(check, EFL_UI_EVENT_SELECTED_CHANGED, _check, &bool_event_info);
66 efl_ui_check_selected_set(check, EINA_TRUE); 66 efl_ui_selectable_selected_set(check, EINA_TRUE);
67 ck_assert_int_eq(bool_event_info, EINA_TRUE); 67 ck_assert_int_eq(bool_event_info, EINA_TRUE);
68 efl_ui_check_selected_set(check, EINA_FALSE); 68 efl_ui_selectable_selected_set(check, EINA_FALSE);
69 ck_assert_int_eq(bool_event_info, EINA_FALSE); 69 ck_assert_int_eq(bool_event_info, EINA_FALSE);
70} 70}
71EFL_END_TEST 71EFL_END_TEST
diff --git a/src/tests/elementary/efl_ui_test_radio_group.c b/src/tests/elementary/efl_ui_test_radio_group.c
index c13d17b7c7..664819dd41 100644
--- a/src/tests/elementary/efl_ui_test_radio_group.c
+++ b/src/tests/elementary/efl_ui_test_radio_group.c
@@ -71,16 +71,16 @@ EFL_START_TEST(active_selected_value_setting)
71 efl_ui_radio_group_selected_value_set(radio_group, 1); 71 efl_ui_radio_group_selected_value_set(radio_group, 1);
72 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1); 72 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
73 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r1); 73 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r1);
74 ck_assert_int_eq(efl_ui_check_selected_get(r1), EINA_TRUE); 74 ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_TRUE);
75 ck_assert_int_eq(efl_ui_check_selected_get(r2), EINA_FALSE); 75 ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_FALSE);
76 EXPECT_EVT(1,1); 76 EXPECT_EVT(1,1);
77 77
78 RESET_EVT 78 RESET_EVT
79 efl_ui_radio_group_selected_object_set(radio_group, r2); 79 efl_ui_radio_group_selected_object_set(radio_group, r2);
80 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 2); 80 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 2);
81 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r2); 81 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r2);
82 ck_assert_int_eq(efl_ui_check_selected_get(r1), EINA_FALSE); 82 ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_FALSE);
83 ck_assert_int_eq(efl_ui_check_selected_get(r2), EINA_TRUE); 83 ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_TRUE);
84 EXPECT_EVT(1,2); 84 EXPECT_EVT(1,2);
85} 85}
86EFL_END_TEST 86EFL_END_TEST
@@ -102,16 +102,16 @@ EFL_START_TEST(active_selection_setting)
102 efl_ui_radio_group_selected_object_set(radio_group, r1); 102 efl_ui_radio_group_selected_object_set(radio_group, r1);
103 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1); 103 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
104 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r1); 104 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r1);
105 ck_assert_int_eq(efl_ui_check_selected_get(r1), EINA_TRUE); 105 ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_TRUE);
106 ck_assert_int_eq(efl_ui_check_selected_get(r2), EINA_FALSE); 106 ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_FALSE);
107 EXPECT_EVT(1,1); 107 EXPECT_EVT(1,1);
108 108
109 RESET_EVT 109 RESET_EVT
110 efl_ui_radio_group_selected_object_set(radio_group, r2); 110 efl_ui_radio_group_selected_object_set(radio_group, r2);
111 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 2); 111 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 2);
112 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r2); 112 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r2);
113 ck_assert_int_eq(efl_ui_check_selected_get(r1), EINA_FALSE); 113 ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_FALSE);
114 ck_assert_int_eq(efl_ui_check_selected_get(r2), EINA_TRUE); 114 ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_TRUE);
115 EXPECT_EVT(1,2); 115 EXPECT_EVT(1,2);
116} 116}
117EFL_END_TEST 117EFL_END_TEST
@@ -127,7 +127,7 @@ EFL_START_TEST(active_selection_object_setting)
127 RESET_EVT 127 RESET_EVT
128 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1); 128 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
129 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), NULL); 129 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), NULL);
130 efl_ui_check_selected_set(r, EINA_TRUE); 130 efl_ui_selectable_selected_set(r, EINA_TRUE);
131 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1); 131 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
132 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r); 132 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r);
133 EXPECT_EVT(1,1); 133 EXPECT_EVT(1,1);
@@ -183,12 +183,12 @@ EFL_START_TEST(external_setting)
183 efl_ui_radio_group_register(radio_group, r); 183 efl_ui_radio_group_register(radio_group, r);
184 efl_ui_radio_group_register(radio_group, radio()); 184 efl_ui_radio_group_register(radio_group, radio());
185 RESET_EVT 185 RESET_EVT
186 efl_ui_check_selected_set(r, EINA_TRUE); 186 efl_ui_selectable_selected_set(r, EINA_TRUE);
187 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1); 187 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
188 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r); 188 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), r);
189 EXPECT_EVT(1,1); 189 EXPECT_EVT(1,1);
190 RESET_EVT 190 RESET_EVT
191 efl_ui_check_selected_set(r, EINA_FALSE); 191 efl_ui_selectable_selected_set(r, EINA_FALSE);
192 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1); 192 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
193 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), NULL); 193 ck_assert_ptr_eq(efl_ui_radio_group_selected_object_get(radio_group), NULL);
194 EXPECT_EVT(1,-1); 194 EXPECT_EVT(1,-1);