summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/elementary/test_part_bg.c6
-rw-r--r--src/bin/elementary/test_ui_collection.c6
-rw-r--r--src/bin/elementary/test_ui_collection_view.c4
-rw-r--r--src/bin/elementary/test_ui_radio.c6
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c8
-rw-r--r--src/examples/elementary/efl_ui_list_view_example_3.c4
-rw-r--r--src/lib/elementary/efl_ui_collection.c4
-rw-r--r--src/lib/elementary/efl_ui_collection_view.c6
-rw-r--r--src/lib/elementary/efl_ui_item.c4
-rw-r--r--src/lib/elementary/efl_ui_multi_selectable.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio_box.c2
-rw-r--r--src/lib/elementary/efl_ui_radio_group_impl.c2
-rw-r--r--src/lib/elementary/efl_ui_select_model.c2
-rw-r--r--src/lib/elementary/efl_ui_single_selectable.eo1
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.c2
-rw-r--r--src/tests/elementary/efl_ui_test_radio_group.c28
-rw-r--r--src/tests/elementary/spec/efl_test_multi_selectable.c98
-rw-r--r--src/tests/elementary/spec/efl_test_single_selectable.c14
19 files changed, 101 insertions, 100 deletions
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index da50aae206..3f3c9db14a 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -15,7 +15,7 @@ _reset_cb(void *data, const Efl_Event *ev EINA_UNUSED)
15 Efl_Ui_Radio_Group *radio = data; 15 Efl_Ui_Radio_Group *radio = data;
16 Evas_Object *target; 16 Evas_Object *target;
17 17
18 radio = efl_ui_single_selectable_last_selected_get(radio); 18 radio = efl_ui_selectable_last_selected_get(radio);
19 target = evas_object_data_get(radio, "data"); 19 target = evas_object_data_get(radio, "data");
20 20
21 efl_gfx_color_set(efl_part(target, "background"), 0, 0, 0, 0); 21 efl_gfx_color_set(efl_part(target, "background"), 0, 0, 0, 0);
@@ -29,7 +29,7 @@ _color_cb(void *data, const Efl_Event *ev EINA_UNUSED)
29 Evas_Object *target; 29 Evas_Object *target;
30 static Eina_Bool i; 30 static Eina_Bool i;
31 31
32 radio = efl_ui_single_selectable_last_selected_get(radio); 32 radio = efl_ui_selectable_last_selected_get(radio);
33 target = evas_object_data_get(radio, "data"); 33 target = evas_object_data_get(radio, "data");
34 i ^= EINA_TRUE; 34 i ^= EINA_TRUE;
35 efl_gfx_color_set(efl_part(target, "background"), (i) ? 255 : 0, (i) ? 0 : 255, 0, 255); 35 efl_gfx_color_set(efl_part(target, "background"), (i) ? 255 : 0, (i) ? 0 : 255, 0, 255);
@@ -43,7 +43,7 @@ _scale_type_cb(void *data, const Efl_Event *ev EINA_UNUSED)
43 Efl_Gfx_Image_Scale_Method type; 43 Efl_Gfx_Image_Scale_Method type;
44 char buf[PATH_MAX]; 44 char buf[PATH_MAX];
45 45
46 radio = efl_ui_single_selectable_last_selected_get(radio); 46 radio = efl_ui_selectable_last_selected_get(radio);
47 target = evas_object_data_get(radio, "data"); 47 target = evas_object_data_get(radio, "data");
48 48
49 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); 49 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
diff --git a/src/bin/elementary/test_ui_collection.c b/src/bin/elementary/test_ui_collection.c
index f407a6988a..3d1b34e3cd 100644
--- a/src/bin/elementary/test_ui_collection.c
+++ b/src/bin/elementary/test_ui_collection.c
@@ -7,13 +7,13 @@
7static void 7static void
8_all_select(void *data, const Efl_Event *ev EINA_UNUSED) 8_all_select(void *data, const Efl_Event *ev EINA_UNUSED)
9{ 9{
10 efl_ui_all_select(data); 10 efl_ui_selectable_all_select(data);
11} 11}
12 12
13static void 13static void
14_all_unselect(void *data, const Efl_Event *ev EINA_UNUSED) 14_all_unselect(void *data, const Efl_Event *ev EINA_UNUSED)
15{ 15{
16 efl_ui_all_unselect(data); 16 efl_ui_selectable_all_unselect(data);
17} 17}
18 18
19static void 19static void
@@ -167,7 +167,7 @@ _select_value_cb(void *data, const Efl_Event *ev)
167{ 167{
168 Efl_Ui_Collection *c = data; 168 Efl_Ui_Collection *c = data;
169 169
170 efl_ui_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object)); 170 efl_ui_selectable_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object));
171} 171}
172 172
173void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class *item, const char *name) 173void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class *item, const char *name)
diff --git a/src/bin/elementary/test_ui_collection_view.c b/src/bin/elementary/test_ui_collection_view.c
index 4a3f2f7b7c..ba34d320b5 100644
--- a/src/bin/elementary/test_ui_collection_view.c
+++ b/src/bin/elementary/test_ui_collection_view.c
@@ -46,7 +46,7 @@ _item_constructing(void *data EINA_UNUSED, const Efl_Event *ev)
46static void 46static void
47_item_select(void *data, const Efl_Event *ev) 47_item_select(void *data, const Efl_Event *ev)
48{ 48{
49 Efl_Ui_Widget *w = efl_ui_single_selectable_last_selected_get(ev->object); 49 Efl_Ui_Widget *w = efl_ui_selectable_last_selected_get(ev->object);
50 Efl_Model *m = efl_ui_view_model_get(w); 50 Efl_Model *m = efl_ui_view_model_get(w);
51 51
52 if (m) efl_ui_view_model_set(data, m); 52 if (m) efl_ui_view_model_set(data, m);
@@ -100,7 +100,7 @@ void test_efl_ui_collection_view(void *data EINA_UNUSED,
100 efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE)); 100 efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE));
101 efl_provider_register(f, EFL_MODEL_PROVIDER_CLASS, provider); 101 efl_provider_register(f, EFL_MODEL_PROVIDER_CLASS, provider);
102 efl_pack_table(tbl, f, 1, 1, 1, 1); 102 efl_pack_table(tbl, f, 1, 1, 1, 1);
103 efl_event_callback_add(lv, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, _item_select, provider); 103 efl_event_callback_add(lv, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, _item_select, provider);
104 104
105 ib = efl_add(EFL_UI_BOX_CLASS, f, 105 ib = efl_add(EFL_UI_BOX_CLASS, f,
106 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 106 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
diff --git a/src/bin/elementary/test_ui_radio.c b/src/bin/elementary/test_ui_radio.c
index e03dcf5ee0..8fa1f31229 100644
--- a/src/bin/elementary/test_ui_radio.c
+++ b/src/bin/elementary/test_ui_radio.c
@@ -79,10 +79,10 @@ _set_selected_btn_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
79static void 79static void
80_set_fallback_radio_btn_clicked(void *data, const Efl_Event *ev EINA_UNUSED) 80_set_fallback_radio_btn_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
81{ 81{
82 if (!efl_ui_single_selectable_fallback_selection_get(data)) 82 if (!efl_ui_selectable_fallback_selection_get(data))
83 efl_ui_single_selectable_fallback_selection_set(data, efl_pack_content_get(data, 4)); 83 efl_ui_selectable_fallback_selection_set(data, efl_pack_content_get(data, 4));
84 else 84 else
85 efl_ui_single_selectable_fallback_selection_set(data, NULL); 85 efl_ui_selectable_fallback_selection_set(data, NULL);
86} 86}
87 87
88void test_efl_ui_radio(void *data EINA_UNUSED, 88void test_efl_ui_radio(void *data EINA_UNUSED,
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index dab45ae261..5b808d0da8 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -30,7 +30,7 @@ _list_selected(void *data EINA_UNUSED, const Efl_Event *ev)
30 Eo *item = ev->info, *tmp; 30 Eo *item = ev->info, *tmp;
31 printf("list item [%p:%d] is %s\n", item, efl_ui_item_index_get(item), (efl_ui_selectable_selected_get(item)? "selected" : "unselected")); 31 printf("list item [%p:%d] is %s\n", item, efl_ui_item_index_get(item), (efl_ui_selectable_selected_get(item)? "selected" : "unselected"));
32 32
33 Eina_Iterator *selects = efl_ui_selected_iterator_new(list); 33 Eina_Iterator *selects = efl_ui_selectable_selected_iterator_new(list);
34 34
35 EINA_ITERATOR_FOREACH(selects, tmp) 35 EINA_ITERATOR_FOREACH(selects, tmp)
36 printf("selected [%p:%d] ", tmp, efl_ui_item_index_get(tmp)); 36 printf("selected [%p:%d] ", tmp, efl_ui_item_index_get(tmp));
@@ -70,7 +70,7 @@ static void
70_select_radio_changed(void *data, const Efl_Event *ev) 70_select_radio_changed(void *data, const Efl_Event *ev)
71{ 71{
72 Eo *list = data; 72 Eo *list = data;
73 efl_ui_select_mode_set(list, efl_ui_radio_group_selected_value_get(ev->object)); 73 efl_ui_selectable_select_mode_set(list, efl_ui_radio_group_selected_value_get(ev->object));
74} 74}
75 75
76static void 76static void
@@ -82,7 +82,7 @@ _anim_radio_changed(void *data, const Efl_Event *ev EINA_UNUSED)
82static void 82static void
83_scrl_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) 83_scrl_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
84{ 84{
85 Efl_Ui_List_Default_Item *item = efl_ui_single_selectable_last_selected_get(priv_d.list); 85 Efl_Ui_List_Default_Item *item = efl_ui_selectable_last_selected_get(priv_d.list);
86 printf("show [%d:%p] [%d]\n", efl_ui_item_index_get(item), item, priv_d.anim); 86 printf("show [%d:%p] [%d]\n", efl_ui_item_index_get(item), item, priv_d.anim);
87 efl_ui_collection_item_scroll(priv_d.list, item, priv_d.anim); 87 efl_ui_collection_item_scroll(priv_d.list, item, priv_d.anim);
88} 88}
@@ -90,7 +90,7 @@ _scrl_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
90static void 90static void
91_scrl_align_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) 91_scrl_align_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
92{ 92{
93 Efl_Ui_List_Default_Item *item = efl_ui_single_selectable_last_selected_get(priv_d.list); 93 Efl_Ui_List_Default_Item *item = efl_ui_selectable_last_selected_get(priv_d.list);
94 double align = efl_ui_range_value_get(priv_d.slider); 94 double align = efl_ui_range_value_get(priv_d.slider);
95 printf("show [%d:%p] [%.2lf], [%d]\n", efl_ui_item_index_get(item), item, align, priv_d.anim); 95 printf("show [%d:%p] [%.2lf], [%d]\n", efl_ui_item_index_get(item), item, align, priv_d.anim);
96 efl_ui_collection_item_scroll_align(priv_d.list, item, align, priv_d.anim); 96 efl_ui_collection_item_scroll_align(priv_d.list, item, align, priv_d.anim);
diff --git a/src/examples/elementary/efl_ui_list_view_example_3.c b/src/examples/elementary/efl_ui_list_view_example_3.c
index ca839bcf59..c9f6b0db97 100644
--- a/src/examples/elementary/efl_ui_list_view_example_3.c
+++ b/src/examples/elementary/efl_ui_list_view_example_3.c
@@ -60,7 +60,7 @@ _selected(void *data, const Efl_Event *event)
60{ 60{
61 Priv_Data *priv = (Priv_Data*)data; 61 Priv_Data *priv = (Priv_Data*)data;
62 62
63 priv->selected = efl_ui_single_selectable_last_selected_get(event->object); 63 priv->selected = efl_ui_selectable_last_selected_get(event->object);
64} 64}
65 65
66static void 66static void
@@ -299,7 +299,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
299 elm_box_pack_end(vbx, bt); 299 elm_box_pack_end(vbx, bt);
300 300
301 elm_box_pack_end(bx, priv->list2); 301 elm_box_pack_end(bx, priv->list2);
302 efl_event_callback_add(priv->list2, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, _selected, priv); 302 efl_event_callback_add(priv->list2, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, _selected, priv);
303 303
304 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, priv); 304 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, priv);
305 305
diff --git a/src/lib/elementary/efl_ui_collection.c b/src/lib/elementary/efl_ui_collection.c
index 0dac5b0a60..a281997974 100644
--- a/src/lib/elementary/efl_ui_collection.c
+++ b/src/lib/elementary/efl_ui_collection.c
@@ -431,7 +431,7 @@ _efl_ui_collection_efl_object_invalidate(Eo *obj, Efl_Ui_Collection_Data *pd EIN
431{ 431{
432 efl_ui_collection_position_manager_set(obj, NULL); 432 efl_ui_collection_position_manager_set(obj, NULL);
433 433
434 efl_ui_single_selectable_fallback_selection_set(obj, NULL); 434 efl_ui_selectable_fallback_selection_set(obj, NULL);
435 435
436 deselect_all(pd); 436 deselect_all(pd);
437 437
@@ -514,7 +514,7 @@ _schedule_selection_job_cb(Eo *o, void *data EINA_UNUSED, const Eina_Value value
514 514
515 pd->selection_changed_job = NULL; 515 pd->selection_changed_job = NULL;
516 516
517 efl_event_callback_call(o, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL); 517 efl_event_callback_call(o, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
518 518
519 return EINA_VALUE_EMPTY; 519 return EINA_VALUE_EMPTY;
520} 520}
diff --git a/src/lib/elementary/efl_ui_collection_view.c b/src/lib/elementary/efl_ui_collection_view.c
index 608c31c059..400e80e7be 100644
--- a/src/lib/elementary/efl_ui_collection_view.c
+++ b/src/lib/elementary/efl_ui_collection_view.c
@@ -1885,7 +1885,7 @@ _efl_ui_collection_view_model_changed(void *data, const Efl_Event *event)
1885 if (pd->multi_selectable_async_model) 1885 if (pd->multi_selectable_async_model)
1886 { 1886 {
1887 efl_event_callback_forwarder_del(pd->multi_selectable_async_model, 1887 efl_event_callback_forwarder_del(pd->multi_selectable_async_model,
1888 EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, 1888 EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED,
1889 data); 1889 data);
1890 efl_composite_detach(data, pd->multi_selectable_async_model); 1890 efl_composite_detach(data, pd->multi_selectable_async_model);
1891 efl_replace(&pd->multi_selectable_async_model, NULL); 1891 efl_replace(&pd->multi_selectable_async_model, NULL);
@@ -1934,14 +1934,14 @@ _efl_ui_collection_view_model_changed(void *data, const Efl_Event *event)
1934 if (pd->multi_selectable_async_model) 1934 if (pd->multi_selectable_async_model)
1935 { 1935 {
1936 efl_event_callback_forwarder_del(pd->multi_selectable_async_model, 1936 efl_event_callback_forwarder_del(pd->multi_selectable_async_model,
1937 EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, 1937 EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED,
1938 data); 1938 data);
1939 efl_composite_detach(data, pd->multi_selectable_async_model); 1939 efl_composite_detach(data, pd->multi_selectable_async_model);
1940 } 1940 }
1941 efl_replace(&pd->multi_selectable_async_model, mselect); 1941 efl_replace(&pd->multi_selectable_async_model, mselect);
1942 efl_composite_attach(data, pd->multi_selectable_async_model); 1942 efl_composite_attach(data, pd->multi_selectable_async_model);
1943 efl_event_callback_forwarder_add(pd->multi_selectable_async_model, 1943 efl_event_callback_forwarder_add(pd->multi_selectable_async_model,
1944 EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, 1944 EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED,
1945 data); 1945 data);
1946 1946
1947 if (!sizing) model = efl_add(EFL_UI_HOMOGENEOUS_MODEL_CLASS, data, 1947 if (!sizing) model = efl_add(EFL_UI_HOMOGENEOUS_MODEL_CLASS, data,
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index 3dce9c3837..f3c35ac9cf 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -30,10 +30,10 @@ static Efl_Ui_Select_Mode
30_fetch_state(Eo *obj) 30_fetch_state(Eo *obj)
31{ 31{
32 if (efl_isa(obj, EFL_UI_MULTI_SELECTABLE_INTERFACE)) 32 if (efl_isa(obj, EFL_UI_MULTI_SELECTABLE_INTERFACE))
33 return efl_ui_select_mode_get(obj); 33 return efl_ui_selectable_select_mode_get(obj);
34 if (efl_isa(obj, EFL_UI_SINGLE_SELECTABLE_INTERFACE)) 34 if (efl_isa(obj, EFL_UI_SINGLE_SELECTABLE_INTERFACE))
35 return EFL_UI_SELECT_MODE_SINGLE; 35 return EFL_UI_SELECT_MODE_SINGLE;
36 ERR("Uncaught state"); 36 ERR("Uncaught state %s", efl_debug_name_get(obj));
37 return EFL_UI_SELECT_MODE_NONE; 37 return EFL_UI_SELECT_MODE_NONE;
38} 38}
39 39
diff --git a/src/lib/elementary/efl_ui_multi_selectable.eo b/src/lib/elementary/efl_ui_multi_selectable.eo
index ea8e376ad2..251f640185 100644
--- a/src/lib/elementary/efl_ui_multi_selectable.eo
+++ b/src/lib/elementary/efl_ui_multi_selectable.eo
@@ -6,7 +6,7 @@ interface @beta Efl.Ui.Multi_Selectable extends Efl.Ui.Single_Selectable
6 6
7 The implementor of this interface provides the possibility to select multiple Selectables. 7 The implementor of this interface provides the possibility to select multiple Selectables.
8 If not, only @Efl.Ui.Single_Selectable should be implemented.]] 8 If not, only @Efl.Ui.Single_Selectable should be implemented.]]
9 c_prefix: efl_ui; 9 c_prefix: efl_ui_selectable;
10 methods 10 methods
11 { 11 {
12 @property select_mode { 12 @property select_mode {
diff --git a/src/lib/elementary/efl_ui_radio_box.c b/src/lib/elementary/efl_ui_radio_box.c
index 1e18f0f5fc..84f6733926 100644
--- a/src/lib/elementary/efl_ui_radio_box.c
+++ b/src/lib/elementary/efl_ui_radio_box.c
@@ -118,7 +118,7 @@ _efl_ui_radio_box_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Box_Data *pd)
118{ 118{
119 pd->group = efl_new(EFL_UI_RADIO_GROUP_IMPL_CLASS, NULL); 119 pd->group = efl_new(EFL_UI_RADIO_GROUP_IMPL_CLASS, NULL);
120 efl_composite_attach(obj, pd->group); 120 efl_composite_attach(obj, pd->group);
121 efl_event_callback_forwarder_add(pd->group, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, obj); 121 efl_event_callback_forwarder_add(pd->group, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, obj);
122 efl_event_callback_forwarder_add(pd->group, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, obj); 122 efl_event_callback_forwarder_add(pd->group, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, obj);
123 return efl_constructor(efl_super(obj, MY_CLASS)); 123 return efl_constructor(efl_super(obj, MY_CLASS));
124} 124}
diff --git a/src/lib/elementary/efl_ui_radio_group_impl.c b/src/lib/elementary/efl_ui_radio_group_impl.c
index 6c20f96d00..6a14f37115 100644
--- a/src/lib/elementary/efl_ui_radio_group_impl.c
+++ b/src/lib/elementary/efl_ui_radio_group_impl.c
@@ -101,7 +101,7 @@ _selected_cb(void *data, const Efl_Event *ev)
101 else 101 else
102 value = -1; 102 value = -1;
103 efl_event_callback_call(data, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, &value); 103 efl_event_callback_call(data, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, &value);
104 efl_event_callback_call(data, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL); 104 efl_event_callback_call(data, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
105 } 105 }
106} 106}
107 107
diff --git a/src/lib/elementary/efl_ui_select_model.c b/src/lib/elementary/efl_ui_select_model.c
index c05d720667..c6092a50a6 100644
--- a/src/lib/elementary/efl_ui_select_model.c
+++ b/src/lib/elementary/efl_ui_select_model.c
@@ -90,7 +90,7 @@ _select_notification_cb(Eo *o, void *data EINA_UNUSED, const Eina_Value v)
90{ 90{
91 Efl_Ui_Select_Model_Data *pd = efl_data_scope_get(o, EFL_UI_SELECT_MODEL_CLASS); 91 Efl_Ui_Select_Model_Data *pd = efl_data_scope_get(o, EFL_UI_SELECT_MODEL_CLASS);
92 92
93 efl_event_callback_call(o, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL); 93 efl_event_callback_call(o, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
94 94
95 pd->pending_selection_event = NULL; 95 pd->pending_selection_event = NULL;
96 96
diff --git a/src/lib/elementary/efl_ui_single_selectable.eo b/src/lib/elementary/efl_ui_single_selectable.eo
index 373cefa5c2..457bf6cc5d 100644
--- a/src/lib/elementary/efl_ui_single_selectable.eo
+++ b/src/lib/elementary/efl_ui_single_selectable.eo
@@ -4,6 +4,7 @@ interface @beta Efl.Ui.Single_Selectable {
4 The implementor is free to allow a specific number of selectables being selected or not. 4 The implementor is free to allow a specific number of selectables being selected or not.
5 This interface just covers always the latest selected selectable. 5 This interface just covers always the latest selected selectable.
6 ]] 6 ]]
7 c_prefix: efl_ui_selectable;
7 methods { 8 methods {
8 @property last_selected { 9 @property last_selected {
9 [[The selectable that was selected most recently.]] 10 [[The selectable that was selected most recently.]]
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index ff831f8c3d..34e37299e2 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -66,7 +66,7 @@ _selelction_change_cb(void *data, const Efl_Event *ev)
66 } 66 }
67 if (!pd->in_value_change) 67 if (!pd->in_value_change)
68 { 68 {
69 efl_event_callback_call(data, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL); 69 efl_event_callback_call(data, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
70 } 70 }
71} 71}
72 72
diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c
index eb347ab99f..73e7d22c48 100644
--- a/src/lib/elementary/efl_ui_tab_pager.c
+++ b/src/lib/elementary/efl_ui_tab_pager.c
@@ -26,7 +26,7 @@ _tab_select_cb(void *data, const Efl_Event *event)
26 Efl_Ui_Tab_Bar_Default_Item *selected; 26 Efl_Ui_Tab_Bar_Default_Item *selected;
27 Efl_Ui_Tab_Page *page; 27 Efl_Ui_Tab_Page *page;
28 28
29 selected = efl_ui_single_selectable_last_selected_get(event->object); 29 selected = efl_ui_selectable_last_selected_get(event->object);
30 page = efl_parent_get(selected); 30 page = efl_parent_get(selected);
31 if (efl_ui_spotlight_active_element_get(data)) 31 if (efl_ui_spotlight_active_element_get(data))
32 efl_ui_spotlight_active_element_set(data, page); 32 efl_ui_spotlight_active_element_set(data, page);
diff --git a/src/tests/elementary/efl_ui_test_radio_group.c b/src/tests/elementary/efl_ui_test_radio_group.c
index 5b00b02318..cf017bdc24 100644
--- a/src/tests/elementary/efl_ui_test_radio_group.c
+++ b/src/tests/elementary/efl_ui_test_radio_group.c
@@ -65,12 +65,12 @@ EFL_START_TEST(active_selected_value_setting)
65 efl_ui_radio_group_register(radio_group, r2); 65 efl_ui_radio_group_register(radio_group, r2);
66 66
67 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1); 67 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
68 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL); 68 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
69 69
70 RESET_EVT 70 RESET_EVT
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_single_selectable_last_selected_get(radio_group), r1); 73 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r1);
74 ck_assert_int_eq(efl_ui_selectable_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_selectable_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);
@@ -78,7 +78,7 @@ EFL_START_TEST(active_selected_value_setting)
78 RESET_EVT 78 RESET_EVT
79 efl_ui_selectable_selected_set(r2, EINA_TRUE); 79 efl_ui_selectable_selected_set(r2, EINA_TRUE);
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_single_selectable_last_selected_get(radio_group), r2); 81 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r2);
82 ck_assert_int_eq(efl_ui_selectable_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_selectable_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);
@@ -96,12 +96,12 @@ EFL_START_TEST(active_selection_setting)
96 efl_ui_radio_group_register(radio_group, r2); 96 efl_ui_radio_group_register(radio_group, r2);
97 97
98 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1); 98 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
99 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL); 99 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
100 100
101 RESET_EVT 101 RESET_EVT
102 efl_ui_selectable_selected_set(r1, EINA_TRUE); 102 efl_ui_selectable_selected_set(r1, EINA_TRUE);
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_single_selectable_last_selected_get(radio_group), r1); 104 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r1);
105 ck_assert_int_eq(efl_ui_selectable_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_selectable_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);
@@ -109,7 +109,7 @@ EFL_START_TEST(active_selection_setting)
109 RESET_EVT 109 RESET_EVT
110 efl_ui_selectable_selected_set(r2, EINA_TRUE); 110 efl_ui_selectable_selected_set(r2, EINA_TRUE);
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_single_selectable_last_selected_get(radio_group), r2); 112 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r2);
113 ck_assert_int_eq(efl_ui_selectable_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_selectable_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);
@@ -126,10 +126,10 @@ EFL_START_TEST(active_selection_object_setting)
126 126
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_single_selectable_last_selected_get(radio_group), NULL); 129 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
130 efl_ui_selectable_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_single_selectable_last_selected_get(radio_group), r); 132 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
133 EXPECT_EVT(1,1); 133 EXPECT_EVT(1,1);
134} 134}
135EFL_END_TEST 135EFL_END_TEST
@@ -145,12 +145,12 @@ EFL_START_TEST(unregister_setted)
145 RESET_EVT 145 RESET_EVT
146 efl_ui_selectable_selected_set(r, EINA_TRUE); 146 efl_ui_selectable_selected_set(r, EINA_TRUE);
147 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1); 147 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
148 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r); 148 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
149 EXPECT_EVT(1,1); 149 EXPECT_EVT(1,1);
150 RESET_EVT 150 RESET_EVT
151 efl_ui_radio_group_unregister(radio_group, r); 151 efl_ui_radio_group_unregister(radio_group, r);
152 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1); 152 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
153 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL); 153 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
154 EXPECT_EVT(1,-1); 154 EXPECT_EVT(1,-1);
155} 155}
156EFL_END_TEST 156EFL_END_TEST
@@ -165,12 +165,12 @@ EFL_START_TEST(delete_setted)
165 RESET_EVT 165 RESET_EVT
166 efl_ui_selectable_selected_set(r, EINA_TRUE); 166 efl_ui_selectable_selected_set(r, EINA_TRUE);
167 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1); 167 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
168 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r); 168 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
169 EXPECT_EVT(1,1); 169 EXPECT_EVT(1,1);
170 RESET_EVT 170 RESET_EVT
171 efl_del(r); 171 efl_del(r);
172 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1); 172 ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
173 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL); 173 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
174 EXPECT_EVT(1,-1); 174 EXPECT_EVT(1,-1);
175} 175}
176EFL_END_TEST 176EFL_END_TEST
@@ -185,12 +185,12 @@ EFL_START_TEST(external_setting)
185 RESET_EVT 185 RESET_EVT
186 efl_ui_selectable_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_single_selectable_last_selected_get(radio_group), r); 188 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
189 EXPECT_EVT(1,1); 189 EXPECT_EVT(1,1);
190 RESET_EVT 190 RESET_EVT
191 efl_ui_selectable_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_single_selectable_last_selected_get(radio_group), NULL); 193 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
194 EXPECT_EVT(1,-1); 194 EXPECT_EVT(1,-1);
195} 195}
196EFL_END_TEST 196EFL_END_TEST
diff --git a/src/tests/elementary/spec/efl_test_multi_selectable.c b/src/tests/elementary/spec/efl_test_multi_selectable.c
index 5e2c719d77..8f05ba1467 100644
--- a/src/tests/elementary/spec/efl_test_multi_selectable.c
+++ b/src/tests/elementary/spec/efl_test_multi_selectable.c
@@ -36,9 +36,9 @@ EFL_START_TEST(test_multi_select)
36 int c = 0; 36 int c = 0;
37 37
38 Eina_Array *arr_selected; 38 Eina_Array *arr_selected;
39 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 39 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
40 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 40 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
41 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 41 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
42 42
43 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE); 43 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
44 if (c == 0) efl_loop_begin(efl_main_loop_get()); 44 if (c == 0) efl_loop_begin(efl_main_loop_get());
@@ -51,8 +51,8 @@ EFL_START_TEST(test_multi_select)
51 c = 0; 51 c = 0;
52 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_TRUE); 52 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_TRUE);
53 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_TRUE); 53 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_TRUE);
54 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2)); 54 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2));
55 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 55 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
56 ck_assert_int_eq(eina_array_count(arr_selected), 2); 56 ck_assert_int_eq(eina_array_count(arr_selected), 2);
57 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0)); 57 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0));
58 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2)); 58 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2));
@@ -60,8 +60,8 @@ EFL_START_TEST(test_multi_select)
60 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 2), EINA_TRUE); 60 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 2), EINA_TRUE);
61 ck_assert_int_eq(c, 0); 61 ck_assert_int_eq(c, 0);
62 62
63 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 63 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
64 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 64 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
65} 65}
66EFL_END_TEST 66EFL_END_TEST
67 67
@@ -69,9 +69,9 @@ EFL_START_TEST(test_multi_select_removal)
69{ 69{
70 int c = 0; 70 int c = 0;
71 Eina_Array *arr_selected; 71 Eina_Array *arr_selected;
72 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 72 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
73 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 73 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
74 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 74 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
75 75
76 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE); 76 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
77 c = 0; 77 c = 0;
@@ -86,11 +86,11 @@ EFL_START_TEST(test_multi_select_removal)
86 ck_assert_int_eq(c, 1); 86 ck_assert_int_eq(c, 1);
87 c = 0; 87 c = 0;
88 88
89 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), NULL); 89 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), NULL);
90 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 90 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
91 ck_assert_int_eq(eina_array_count(arr_selected), 0); 91 ck_assert_int_eq(eina_array_count(arr_selected), 0);
92 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 92 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
93 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 93 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
94} 94}
95EFL_END_TEST 95EFL_END_TEST
96 96
@@ -99,9 +99,9 @@ EFL_START_TEST(test_single_select)
99 int c = 0; 99 int c = 0;
100 Eina_Array *arr_selected; 100 Eina_Array *arr_selected;
101 101
102 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_SINGLE); 102 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_SINGLE);
103 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 103 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
104 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 104 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
105 105
106 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE); 106 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
107 if (c == 0) efl_loop_begin(efl_main_loop_get()); 107 if (c == 0) efl_loop_begin(efl_main_loop_get());
@@ -113,16 +113,16 @@ EFL_START_TEST(test_single_select)
113 c = 0; 113 c = 0;
114 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE); 114 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE);
115 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_TRUE); 115 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_TRUE);
116 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2)); 116 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2));
117 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 117 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
118 ck_assert_int_eq(eina_array_count(arr_selected), 1); 118 ck_assert_int_eq(eina_array_count(arr_selected), 1);
119 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 2)); 119 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 2));
120 120
121 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 2), EINA_TRUE); 121 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 2), EINA_TRUE);
122 ck_assert_int_eq(c, 0); 122 ck_assert_int_eq(c, 0);
123 123
124 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 124 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
125 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 125 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
126} 126}
127EFL_END_TEST 127EFL_END_TEST
128 128
@@ -131,9 +131,9 @@ EFL_START_TEST(test_none_select)
131 Eina_Array *arr_selected; 131 Eina_Array *arr_selected;
132 int c = 0; 132 int c = 0;
133 133
134 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_NONE); 134 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_NONE);
135 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 135 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
136 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 136 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
137 137
138 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE); 138 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
139 get_me_to_those_events(widget); 139 get_me_to_those_events(widget);
@@ -143,11 +143,11 @@ EFL_START_TEST(test_none_select)
143 ck_assert_int_eq(c, 0); 143 ck_assert_int_eq(c, 0);
144 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE); 144 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE);
145 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_FALSE); 145 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_FALSE);
146 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), NULL); 146 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), NULL);
147 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 147 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
148 ck_assert_int_eq(eina_array_count(arr_selected), 0); 148 ck_assert_int_eq(eina_array_count(arr_selected), 0);
149 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 149 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
150 efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 150 efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
151} 151}
152EFL_END_TEST 152EFL_END_TEST
153 153
@@ -155,9 +155,9 @@ EFL_START_TEST(all_select_api)
155{ 155{
156 Eina_Array *arr_selected; 156 Eina_Array *arr_selected;
157 157
158 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 158 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
159 efl_ui_all_select(widget); 159 efl_ui_selectable_all_select(widget);
160 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 160 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
161 161
162 ck_assert_int_eq(eina_array_count(arr_selected), 3); 162 ck_assert_int_eq(eina_array_count(arr_selected), 3);
163 163
@@ -171,11 +171,11 @@ EFL_START_TEST(all_unselect_api)
171{ 171{
172 Eina_Array *arr_selected; 172 Eina_Array *arr_selected;
173 173
174 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 174 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
175 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE); 175 efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
176 176
177 efl_ui_all_unselect(widget); 177 efl_ui_selectable_all_unselect(widget);
178 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 178 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
179 179
180 ck_assert_int_eq(eina_array_count(arr_selected), 0); 180 ck_assert_int_eq(eina_array_count(arr_selected), 0);
181 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE); 181 ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE);
@@ -186,11 +186,11 @@ EFL_START_TEST(range_unselect)
186{ 186{
187 Eina_Array *arr_selected; 187 Eina_Array *arr_selected;
188 188
189 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 189 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
190 efl_ui_all_select(widget); 190 efl_ui_selectable_all_select(widget);
191 191
192 efl_ui_range_unselect(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2)); 192 efl_ui_selectable_range_unselect(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2));
193 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 193 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
194 ck_assert_int_eq(eina_array_count(arr_selected), 1); 194 ck_assert_int_eq(eina_array_count(arr_selected), 1);
195 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0)); 195 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0));
196} 196}
@@ -200,11 +200,11 @@ EFL_START_TEST(range_unselect2)
200{ 200{
201 Eina_Array *arr_selected; 201 Eina_Array *arr_selected;
202 202
203 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 203 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
204 efl_ui_all_select(widget); 204 efl_ui_selectable_all_select(widget);
205 205
206 efl_ui_range_unselect(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1)); 206 efl_ui_selectable_range_unselect(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1));
207 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 207 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
208 ck_assert_int_eq(eina_array_count(arr_selected), 1); 208 ck_assert_int_eq(eina_array_count(arr_selected), 1);
209 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0)); 209 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0));
210} 210}
@@ -214,9 +214,9 @@ EFL_START_TEST(range_select)
214{ 214{
215 Eina_Array *arr_selected; 215 Eina_Array *arr_selected;
216 216
217 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 217 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
218 efl_ui_range_select(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2)); 218 efl_ui_selectable_range_select(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2));
219 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 219 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
220 ck_assert_int_eq(eina_array_count(arr_selected), 2); 220 ck_assert_int_eq(eina_array_count(arr_selected), 2);
221 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 1)); 221 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 1));
222 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2)); 222 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2));
@@ -227,9 +227,9 @@ EFL_START_TEST(range_select2)
227{ 227{
228 Eina_Array *arr_selected; 228 Eina_Array *arr_selected;
229 229
230 efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI); 230 efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
231 efl_ui_range_select(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1)); 231 efl_ui_selectable_range_select(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1));
232 _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget)); 232 _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
233 ck_assert_int_eq(eina_array_count(arr_selected), 2); 233 ck_assert_int_eq(eina_array_count(arr_selected), 2);
234 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 1)); 234 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 1));
235 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2)); 235 ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2));
@@ -239,7 +239,7 @@ EFL_END_TEST
239void 239void
240efl_ui_multi_selectable_behavior_test(TCase *tc) 240efl_ui_multi_selectable_behavior_test(TCase *tc)
241{ 241{
242 //Items are getting added by the fixture added in efl_ui_single_selectable_behavior_test 242 //Items are getting added by the fixture added in efl_ui_selectable_behavior_test
243 tcase_add_test(tc, test_multi_select); 243 tcase_add_test(tc, test_multi_select);
244 tcase_add_test(tc, test_multi_select_removal); 244 tcase_add_test(tc, test_multi_select_removal);
245 tcase_add_test(tc, test_single_select); 245 tcase_add_test(tc, test_single_select);
diff --git a/src/tests/elementary/spec/efl_test_single_selectable.c b/src/tests/elementary/spec/efl_test_single_selectable.c
index 35cf343d24..b4873ae7cb 100644
--- a/src/tests/elementary/spec/efl_test_single_selectable.c
+++ b/src/tests/elementary/spec/efl_test_single_selectable.c
@@ -37,32 +37,32 @@ EFL_START_TEST(last_selectable_check)
37{ 37{
38 int c = 0; 38 int c = 0;
39 39
40 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c); 40 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
41 efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL); 41 efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
42 42
43 Eo *c1 = efl_pack_content_get(widget, 0); 43 Eo *c1 = efl_pack_content_get(widget, 0);
44 Eo *c2 = efl_pack_content_get(widget, 2); 44 Eo *c2 = efl_pack_content_get(widget, 2);
45 45
46 efl_ui_selectable_selected_set(c1, EINA_TRUE); 46 efl_ui_selectable_selected_set(c1, EINA_TRUE);
47 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), c1); 47 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), c1);
48 if (c == 0) efl_loop_begin(efl_main_loop_get()); 48 if (c == 0) efl_loop_begin(efl_main_loop_get());
49 ck_assert_int_eq(c, 1); 49 ck_assert_int_eq(c, 1);
50 c = 0; 50 c = 0;
51 51
52 efl_ui_selectable_selected_set(c2, EINA_TRUE); 52 efl_ui_selectable_selected_set(c2, EINA_TRUE);
53 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), c2); 53 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), c2);
54 if (c == 0) efl_loop_begin(efl_main_loop_get()); 54 if (c == 0) efl_loop_begin(efl_main_loop_get());
55 ck_assert_int_eq(c, 1); 55 ck_assert_int_eq(c, 1);
56 c = 0; 56 c = 0;
57 57
58 efl_ui_selectable_selected_set(c1, EINA_FALSE); 58 efl_ui_selectable_selected_set(c1, EINA_FALSE);
59 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), c2); 59 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), c2);
60 efl_ui_selectable_selected_set(c2, EINA_FALSE); 60 efl_ui_selectable_selected_set(c2, EINA_FALSE);
61 if (c == 0) efl_loop_begin(efl_main_loop_get()); 61 if (c == 0) efl_loop_begin(efl_main_loop_get());
62 ck_assert_int_eq(c, 1); 62 ck_assert_int_eq(c, 1);
63 c = 0; 63 c = 0;
64 64
65 ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), NULL); 65 ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), NULL);
66} 66}
67EFL_END_TEST 67EFL_END_TEST
68 68
@@ -71,7 +71,7 @@ EFL_START_TEST(fallback_selection)
71 Eo *c1 = efl_pack_content_get(widget, 0); 71 Eo *c1 = efl_pack_content_get(widget, 0);
72 Eo *c2 = efl_pack_content_get(widget, 2); 72 Eo *c2 = efl_pack_content_get(widget, 2);
73 73
74 efl_ui_single_selectable_fallback_selection_set(widget, c2); 74 efl_ui_selectable_fallback_selection_set(widget, c2);
75 ck_assert_int_eq(efl_ui_selectable_selected_get(c2), EINA_TRUE); 75 ck_assert_int_eq(efl_ui_selectable_selected_get(c2), EINA_TRUE);
76 efl_ui_selectable_selected_set(c1, EINA_TRUE); 76 efl_ui_selectable_selected_set(c1, EINA_TRUE);
77 ck_assert_int_eq(efl_ui_selectable_selected_get(c2), EINA_FALSE); 77 ck_assert_int_eq(efl_ui_selectable_selected_get(c2), EINA_FALSE);