6 files changed, 43 insertions, 55 deletions

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
 _activate(Evas_Object *obj)
 {
    // state will be changed by the later call to the selected_set call
-   if (!efl_ui_check_selected_get(obj))
+   if (!efl_ui_selectable_selected_get(obj))
      {
         // FIXME: to do animation during state change , we need different signal
         // so that we can distinguish between state change by user or state change
         // by calling state_change() api. Keep both the signal for backward compatibility
         // and remove "elm,state,check,on" signal emission when we can break ABI.
-        // efl_ui_check_selected_set below will emit "elm,state,check,*" or "efl,state,check,*"
+        // efl_ui_selectable_selected_set below will emit "elm,state,check,*" or "efl,state,check,*"
         if (elm_widget_is_legacy(obj))
           {
              elm_layout_signal_emit(obj, "elm,activate,check,on", "elm");
@@ -79,7 +79,7 @@ _activate(Evas_Object *obj)
         // so that we can distinguish between state change by user or state change
         // by calling state_change() api. Keep both the signal for backward compatibility
         // and remove "elm,state,check,off" signal emission when we can break ABI.
-        // efl_ui_check_selected_set below will emit "elm,state,check,*" or "efl,state,check,*"
+        // efl_ui_selectable_selected_set below will emit "elm,state,check,*" or "efl,state,check,*"
         if (elm_widget_is_legacy(obj))
           {
              elm_layout_signal_emit(obj, "elm,activate,check,off", "elm");
@@ -95,14 +95,14 @@ _activate(Evas_Object *obj)
    //This commit will update the theme with the correct signals
    // "elm,state,check,on" or "elm,state,check,off" for legacy
    // "efl,state,check,on" or "efl,state,check,off" for eo-api
-   efl_ui_check_selected_set(obj, !efl_ui_check_selected_get(obj));
+   efl_ui_selectable_selected_set(obj, !efl_ui_selectable_selected_get(obj));
    if (elm_widget_is_legacy(obj))
      evas_object_smart_callback_call(obj, "changed", NULL);
 
    if (_elm_config->atspi_mode)
      efl_access_state_changed_signal_emit(obj,
                                           EFL_ACCESS_STATE_TYPE_CHECKED,
-                                          efl_ui_check_selected_get(obj));
+                                          efl_ui_selectable_selected_get(obj));
 }
 
 EOLIAN 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
 
    if (elm_widget_is_legacy(obj))
      {
-        if (!efl_ui_check_selected_get(obj))
+        if (!efl_ui_selectable_selected_get(obj))
           elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
         else
           elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
      }
    else
      {
-        if (!efl_ui_check_selected_get(obj))
+        if (!efl_ui_selectable_selected_get(obj))
           elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
         else
           elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
@@ -184,7 +184,7 @@ _access_state_cb(void *data, Evas_Object *obj)
 
    if (elm_widget_disabled_get(obj))
      return strdup(E_("State: Disabled"));
-   if (efl_ui_check_selected_get(obj))
+   if (efl_ui_selectable_selected_get(obj))
      {
         on_text = elm_layout_text_get(data, "on");
 
@@ -214,12 +214,12 @@ _access_state_cb(void *data, Evas_Object *obj)
 static void
 _flush_selected(Eo *obj, Eina_Bool sel)
 {
-   efl_ui_check_selected_set(obj, sel);
+   efl_ui_selectable_selected_set(obj, sel);
 
    if (_elm_config->atspi_mode)
      efl_access_state_changed_signal_emit(obj,
                                           EFL_ACCESS_STATE_TYPE_CHECKED,
-                                          efl_ui_check_selected_get(obj));
+                                          efl_ui_selectable_selected_get(obj));
 }
 
 static void
@@ -260,13 +260,13 @@ _clicked_cb(void *data, const Efl_Event *ev EINA_UNUSED)
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_check_selected_get(const Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED)
+_efl_ui_check_efl_ui_selectable_selected_get(const Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED)
 {
    return pd->selected;
 }
 
 EOLIAN static void
-_efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *pd, Eina_Bool value)
+_efl_ui_check_efl_ui_selectable_selected_set(Eo *obj, Efl_Ui_Check_Data *pd, Eina_Bool value)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
@@ -298,7 +298,7 @@ _efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *pd, Eina_Bool value)
    pd->selected = value;
 
    if (!elm_widget_is_legacy(obj))
-     efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, &pd->selected);
+     efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED_CHANGED, &pd->selected);
 }
 
 EOLIAN static Eo *
@@ -349,13 +349,13 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    EFL_UI_CHECK_DATA_GET_OR_RETURN(obj, sd);
 
-   efl_ui_check_selected_set(obj, state);
+   efl_ui_selectable_selected_set(obj, state);
 }
 
 EAPI Eina_Bool
 elm_check_state_get(const Evas_Object *obj)
 {
-   return !!efl_ui_check_selected_get(obj);
+   return !!efl_ui_selectable_selected_get(obj);
 }
 
 EAPI void
@@ -372,7 +372,7 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
    sd->statep = statep;
    if (*sd->statep != sd->selected)
      {
-        efl_ui_check_selected_set(obj, *sd->statep);
+        efl_ui_selectable_selected_set(obj, *sd->statep);
      }
 }
 
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 @@
-class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Text, Efl.Content, Efl.Input.Clickable
+class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Text, Efl.Content, Efl.Input.Clickable, Efl.Ui.Selectable
 {
    [[Check widget
 
@@ -8,16 +8,6 @@ class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget
    the value of a boolean between false and true.
    ]]
    methods {
-      @property selected {
-         [[The on/off state of the check object.]]
-         set {
-         }
-         get {
-         }
-         values {
-            value: bool; [[$true if the check object is selected, $false otherwise]]
-         }
-      }
    }
    implements {
       Efl.Object.constructor;
@@ -30,8 +20,6 @@ class @beta Efl.Ui.Check extends Efl.Ui.Layout_Base implements Efl.Access.Widget
       Efl.Content.content_unset;
       Efl.Text.text { get; set; }
       Efl.Ui.L10n.l10n_text { get; set; }
-   }
-   events {
-      selected,changed : bool; [[Emitted each time selected has changed]]
+      Efl.Ui.Selectable.selected {get; set; }
    }
 }
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 @@
 EAPI void
 elm_check_selected_set(Efl_Ui_Check *obj, Eina_Bool value)
 {
-   efl_ui_check_selected_set(obj, value);
+   efl_ui_selectable_selected_set(obj, value);
 }
 
 EAPI Eina_Bool
 elm_check_selected_get(const Efl_Ui_Check *obj)
 {
-   return efl_ui_check_selected_get(obj);
+   return efl_ui_selectable_selected_get(obj);
 }
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)
    else
      source = "efl";
 
-   if (efl_ui_check_selected_get(obj))
+   if (efl_ui_selectable_selected_get(obj))
      state = "on";
    else
      state = "off";
@@ -63,16 +63,16 @@ _radio_widget_signal_emit(Evas_Object *obj, const char *middle_term)
 }
 
 static void
-_efl_ui_radio_efl_ui_check_selected_set(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED, Eina_Bool value)
+_efl_ui_radio_efl_ui_selectable_selected_set(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED, Eina_Bool value)
 {
-   if (value == efl_ui_check_selected_get(obj)) return;
-   efl_ui_check_selected_set(efl_super(obj, MY_CLASS), value);
+   if (value == efl_ui_selectable_selected_get(obj)) return;
+   efl_ui_selectable_selected_set(efl_super(obj, MY_CLASS), value);
 
    _radio_widget_signal_emit(obj, "state,radio");
 
    if (_elm_config->atspi_mode)
      {
-        if (efl_ui_check_selected_get(obj))
+        if (efl_ui_selectable_selected_get(obj))
           {
              efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_CHECKED, EINA_TRUE);
           }
@@ -97,24 +97,24 @@ _state_set_all(Efl_Ui_Radio_Data *sd, Eina_Bool activate)
      {
         ELM_RADIO_DATA_GET(child, sdc);
 
-        if (efl_ui_check_selected_get(child)) selected = child;
+        if (efl_ui_selectable_selected_get(child)) selected = child;
         if (sdc->value == sd->group->value)
           {
              if (activate) _activate_state_emit(child);
-             efl_ui_check_selected_set(child, EINA_TRUE);
-             if (!efl_ui_check_selected_get(child)) disabled = EINA_TRUE;
+             efl_ui_selectable_selected_set(child, EINA_TRUE);
+             if (!efl_ui_selectable_selected_get(child)) disabled = EINA_TRUE;
           }
         else
           {
              if (activate) _activate_state_emit(child);
-             efl_ui_check_selected_set(child, EINA_FALSE);
+             efl_ui_selectable_selected_set(child, EINA_FALSE);
           }
      }
 
    if ((disabled) && (selected))
      {
         if (activate) _activate_state_emit(selected);
-        efl_ui_check_selected_set(selected, EINA_TRUE);
+        efl_ui_selectable_selected_set(selected, EINA_TRUE);
      }
 }
 
@@ -144,7 +144,7 @@ _activate(Evas_Object *obj)
    else
      {
         //in new API, we just toggle the state of the widget, rest will be automatically handled
-        efl_ui_check_selected_set(obj, !efl_ui_check_selected_get(obj));
+        efl_ui_selectable_selected_set(obj, !efl_ui_selectable_selected_get(obj));
      }
 }
 
@@ -165,12 +165,12 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd EINA_UNUS
 
    if (elm_widget_is_legacy(obj))
      {
-        if (efl_ui_check_selected_get(obj)) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
+        if (efl_ui_selectable_selected_get(obj)) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
         else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
      }
    else
      {
-        if (efl_ui_check_selected_get(obj)) elm_layout_signal_emit(obj, "efl,state,radio,on", "efl");
+        if (efl_ui_selectable_selected_get(obj)) elm_layout_signal_emit(obj, "efl,state,radio,on", "efl");
         else elm_layout_signal_emit(obj, "efl,state,radio,off", "efl");
      }
 
@@ -203,7 +203,7 @@ static char *
 _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
 {
    if (elm_widget_disabled_get(obj)) return strdup(E_("State: Disabled"));
-   if (efl_ui_check_selected_get(obj)) return strdup(E_("State: On"));
+   if (efl_ui_selectable_selected_get(obj)) return strdup(E_("State: On"));
 
    return strdup(E_("State: Off"));
 }
@@ -259,8 +259,8 @@ _efl_ui_radio_state_value_set(Eo *obj, Efl_Ui_Radio_Data *sd, int value)
    sd->value = value;
    if (elm_widget_is_legacy(obj))
      {
-        if (sd->value == sd->group->value) efl_ui_check_selected_set(obj, EINA_TRUE);
-        else efl_ui_check_selected_set(obj, EINA_FALSE);
+        if (sd->value == sd->group->value) efl_ui_selectable_selected_set(obj, EINA_TRUE);
+        else efl_ui_selectable_selected_set(obj, EINA_FALSE);
      }
 }
 
@@ -504,8 +504,8 @@ elm_radio_group_add(Efl_Ui_Radio *obj, Efl_Ui_Radio *group)
         sd->group = sdg->group;
         sd->group->radios = eina_list_append(sd->group->radios, obj);
      }
-   if (sd->value == sd->group->value) efl_ui_check_selected_set(obj, EINA_TRUE);
-   else efl_ui_check_selected_set(obj, EINA_FALSE);
+   if (sd->value == sd->group->value) efl_ui_selectable_selected_set(obj, EINA_TRUE);
+   else efl_ui_selectable_selected_set(obj, EINA_FALSE);
 }
 
 #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
       Efl.Ui.Widget.widget_input_event_handler;
       Efl.Access.Object.state_set { get; }
       Efl.Access.Widget.Action.elm_actions { get; }
-      Efl.Ui.Check.selected {set;}
+      Efl.Ui.Selectable.selected {set;}
    }
 }
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
    //it is essential to *first* set pd->selected to the new state before calling this
    //otherwise this here will be called again, and the event will get emitted twice
    if (old_selected && efl_alive_get(old_selected))
-    efl_ui_check_selected_set(old_selected, EINA_FALSE);
+    efl_ui_selectable_selected_set(old_selected, EINA_FALSE);
 
    if (pd->selected)
      {
-        efl_ui_check_selected_set(pd->selected, EINA_TRUE);
+        efl_ui_selectable_selected_set(pd->selected, EINA_TRUE);
         new_value = efl_ui_radio_state_value_get(pd->selected);
      }
    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
 static void
 _selected_cb(void *data, const Efl_Event *ev)
 {
-   if (efl_ui_check_selected_get(ev->object))
+   if (efl_ui_selectable_selected_get(ev->object))
      {
         efl_ui_radio_group_selected_object_set(data, ev->object);
      }
@@ -91,7 +91,7 @@ _invalidate_cb(void *data, const Efl_Event *ev)
 }
 
 EFL_CALLBACKS_ARRAY_DEFINE(radio_btn_cb,
-  {EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _selected_cb},
+  {EFL_UI_EVENT_SELECTED_CHANGED, _selected_cb},
   {EFL_EVENT_INVALIDATE, _invalidate_cb},
 )