X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_check.c;h=efa3ccc9733badf6e7d648a1e2a701f18e58b076;hb=7db660f4d4570360151c8dfb98371c1e8b0b48cf;hp=94c8fbaa1170f3361651bc9f93f12aee2842a72d;hpb=ffa02ec7924e0bd90e3b721c9e03730f31410a38;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 94c8fba..efa3ccc 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -13,26 +13,29 @@ struct _Widget_Data
 };
 
 static const char *widtype = NULL;
+static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src,
+                             Evas_Callback_Type type, void *event_info);
 static void _del_hook(Evas_Object *obj);
 static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
 static void _theme_hook(Evas_Object *obj);
 static void _disable_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
-static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj,
+                                void *event_info);
 static void _sub_del(void *data, Evas_Object *obj, void *event_info);
-static void _signal_check_off(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _signal_check_on(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _signal_check_toggle(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_check_off(void *data, Evas_Object *obj,
+                              const char *emission, const char *source);
+static void _signal_check_on(void *data, Evas_Object *obj,
+                             const char *emission, const char *source);
+static void _signal_check_toggle(void *data, Evas_Object *obj,
+                                 const char *emission, const char *source);
 static void _on_focus_hook(void *data, Evas_Object *obj);
 static void _activate_hook(Evas_Object *obj);
-static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content);
+static void _content_set_hook(Evas_Object *obj, const char *part,
+                              Evas_Object *content);
 static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part);
 static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part);
-
 static void _activate(Evas_Object *obj);
-static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src,
-                             Evas_Callback_Type type, void *event_info);
-
 static const char SIG_CHANGED[] = "changed";
 static const Evas_Smart_Cb_Description _signals[] = {
        {SIG_CHANGED, ""},
@@ -40,7 +43,8 @@ static const Evas_Smart_Cb_Description _signals[] = {
 };
 
 static Eina_Bool
-_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info)
+_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__,
+            Evas_Callback_Type type, void *event_info)
 {
    if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
    Evas_Event_Key_Down *ev = event_info;
@@ -55,7 +59,6 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
    return EINA_TRUE;
 }
 
-
 static void
 _del_hook(Evas_Object *obj)
 {
@@ -104,7 +107,6 @@ _theme_hook(Evas_Object *obj)
    char s1[PATH_MAX] = {'\0',};
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-
    _elm_widget_mirrored_reload(obj);
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
    _elm_theme_object_set(obj, wd->chk, "check", "base", elm_widget_style_get(obj));
@@ -113,27 +115,20 @@ _theme_hook(Evas_Object *obj)
    else
      edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm");
    if (wd->state)
-     {
-        edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
-        edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
-     }
+     edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
    else
-     {
-        edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
-        edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
-     }
+     edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
    if (wd->label)
      edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm");
    else
      edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm");
-   edje_object_part_text_set(wd->chk, "elm.text", wd->label);
-   edje_object_part_text_set(wd->chk, "elm.ontext", wd->ontext);
-   edje_object_part_text_set(wd->chk, "elm.offtext", wd->offtext);
+   edje_object_part_text_escaped_set(wd->chk, "elm.text", wd->label);
+   edje_object_part_text_escaped_set(wd->chk, "elm.ontext", wd->ontext);
+   edje_object_part_text_escaped_set(wd->chk, "elm.offtext", wd->offtext);
    if (elm_widget_disabled_get(obj))
      edje_object_signal_emit(wd->chk, "elm,state,disabled", "elm");
    edje_object_message_signal_process(wd->chk);
    edje_object_scale_set(wd->chk, elm_widget_scale_get(obj) * _elm_config->scale);
-
    //introduced internationalization of additional text parts used in style
    while (1)
      {
@@ -212,7 +207,6 @@ _signal_check_off(void *data, Evas_Object *obj __UNUSED__, const char *emission
    wd->state = EINA_FALSE;
    if (wd->statep) *wd->statep = wd->state;
    edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
-   edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
    evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
 }
 
@@ -224,7 +218,6 @@ _signal_check_on(void *data, Evas_Object *obj __UNUSED__, const char *emission _
    wd->state = EINA_TRUE;
    if (wd->statep) *wd->statep = wd->state;
    edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
-   edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
    evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
 }
 
@@ -241,10 +234,38 @@ _activate_hook(Evas_Object *obj)
 }
 
 static void
-_content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content)
+_signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+
+   edje_object_signal_emit(wd->chk, emission, source);
+}
+
+static void
+_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   edje_object_signal_callback_add(wd->chk, emission, source, func_cb, data);
+}
+
+static void
+_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
+   edje_object_signal_callback_del_full(wd->chk, emission, source, func_cb,
+                                        data);
+}
+
+static void
+_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd;
+
+   if (part && strcmp(part, "icon")) return;
+   wd = elm_widget_data_get(obj);
    if (!wd) return;
    if (wd->icon == content) return;
    if (wd->icon) evas_object_del(wd->icon);
@@ -263,28 +284,30 @@ _content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *co
 }
 
 static Evas_Object *
-_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__)
+_content_get_hook(const Evas_Object *obj, const char *part)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
+   Widget_Data *wd;
+
+   if (part && strcmp(part, "icon")) return NULL;
+   wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
    return wd->icon;
 }
 
 static Evas_Object *
-_content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
+_content_unset_hook(Evas_Object *obj, const char *part)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
+   Widget_Data *wd;
+
+   if (part && strcmp(part, "icon")) return NULL;
+   wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
    if (!wd->icon) return NULL;
    Evas_Object *icon = wd->icon;
    elm_widget_sub_object_del(obj, wd->icon);
-   evas_object_event_callback_del_full(wd->icon,
-                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                       _changed_size_hints, obj);
-   edje_object_part_unswallow(wd->chk, wd->icon);
-   wd->icon = NULL;
+   edje_object_part_unswallow(wd->chk, icon);
    return icon;
 }
 
@@ -342,17 +365,17 @@ _elm_check_label_set(Evas_Object *obj, const char *item, const char *label)
         else
            edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm");
         edje_object_message_signal_process(wd->chk);
-        edje_object_part_text_set(wd->chk, "elm.text", label);
+        edje_object_part_text_escaped_set(wd->chk, "elm.text", label);
      }
    else if ((item) && (!strcmp(item, "on")))
      {
         eina_stringshare_replace(&wd->ontext, label);
-        edje_object_part_text_set(wd->chk, "elm.ontext", wd->ontext);
+        edje_object_part_text_escaped_set(wd->chk, "elm.ontext", wd->ontext);
      }
    else if ((item) && (!strcmp(item, "off")))
      {
         eina_stringshare_replace(&wd->offtext, label);
-        edje_object_part_text_set(wd->chk, "elm.offtext", wd->offtext);
+        edje_object_part_text_escaped_set(wd->chk, "elm.offtext", wd->offtext);
      }
    _sizing_eval(obj);
 }
@@ -431,6 +454,9 @@ elm_check_add(Evas_Object *parent)
    elm_widget_can_focus_set(obj, EINA_TRUE);
    elm_widget_activate_hook_set(obj, _activate_hook);
    elm_widget_event_hook_set(obj, _event_hook);
+   elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
+   elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook);
+   elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
    elm_widget_text_set_hook_set(obj, _elm_check_label_set);
    elm_widget_text_get_hook_set(obj, _elm_check_label_get);
    elm_widget_content_set_hook_set(obj, _content_set_hook);
@@ -467,50 +493,6 @@ elm_check_add(Evas_Object *parent)
 }
 
 EAPI void
-elm_check_label_set(Evas_Object *obj, const char *label)
-{
-   _elm_check_label_set(obj, NULL, label);
-}
-
-EAPI const char *
-elm_check_label_get(const Evas_Object *obj)
-{
-   return _elm_check_label_get(obj, NULL);
-}
-
-EAPI void
-elm_check_states_labels_set(Evas_Object *obj, const char *ontext, const char *offtext)
-{
-   _elm_check_label_set(obj, "on", ontext);
-   _elm_check_label_set(obj, "off", offtext);
-}
-
-EAPI void
-elm_check_states_labels_get(const Evas_Object *obj, const char **ontext, const char **offtext)
-{
-   if (ontext) *ontext = _elm_check_label_get(obj, "on");
-   if (offtext) *offtext = _elm_check_label_get(obj, "off");
-}
-
-EAPI void
-elm_check_icon_set(Evas_Object *obj, Evas_Object *icon)
-{
-   _content_set_hook(obj, NULL, icon);
-}
-
-EAPI Evas_Object *
-elm_check_icon_get(const Evas_Object *obj)
-{
-   return _content_get_hook(obj, NULL);
-}
-
-EAPI Evas_Object *
-elm_check_icon_unset(Evas_Object *obj)
-{
-   return _content_unset_hook(obj, NULL);
-}
-
-EAPI void
 elm_check_state_set(Evas_Object *obj, Eina_Bool state)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
@@ -521,15 +503,9 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
         wd->state = state;
         if (wd->statep) *wd->statep = wd->state;
         if (wd->state)
-          {
-             edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
-             edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
-          }
+          edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
         else
-          {
-             edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
-             edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
-          }
+          edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
      }
    edje_object_message_signal_process(wd->chk);
 }
@@ -556,15 +532,9 @@ elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep)
           {
              wd->state = *wd->statep;
              if (wd->state)
-               {
-                  edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
-                  edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
-               }
+               edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
              else
-               {
-                  edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
-                  edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
-               }
+               edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
           }
      }
    else