X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_flipselector.c;h=7939aba8e08a3eaf5fa721d46310eb70ed69a60f;hb=8b32f3712183fc44ce1f965e8a95069fe2bbc6cd;hp=c4b56f0677d1c5a1f82219a8958c5dbf89e673bb;hpb=4f67709746839e2ede6156ee691090c13caa2000;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index c4b56f0..7939aba 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -7,10 +7,6 @@
 /* TODO: if one ever wants to extend it to receiving generic widgets
    as items, be my guest. in this case, remember to implement the
    items tooltip infra. */
-<<<<<<< HEAD
-/* TODO: implement disabled mode -- disable_hook() and stuff. */
-=======
->>>>>>> remotes/origin/upstream
 /* TODO: fix default theme image borders for looong strings as item
    labels. */
 /* TODO: set text elipsis on labels if one enforces mininum size on
@@ -77,11 +73,6 @@ _item_text_set_hook(Elm_Object_Item *it,
                     const char *part,
                     const char *label)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-
-=======
->>>>>>> remotes/origin/upstream
    Widget_Data *wd;
    Eina_List *l;
    Elm_Flipselector_Item *item;
@@ -90,11 +81,7 @@ _item_text_set_hook(Elm_Object_Item *it,
 
    if (part && strcmp(part ,"default")) return;
 
-<<<<<<< HEAD
-   item = (Elm_Flipselector_Item *) it;
-=======
    item = (Elm_Flipselector_Item *)it;
->>>>>>> remotes/origin/upstream
    wd = elm_widget_data_get(WIDGET(item));
    if ((!wd) || (!wd->items)) return;
 
@@ -117,27 +104,9 @@ _item_text_set_hook(Elm_Object_Item *it,
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-
-   Elm_Flipselector_Item *item, *_item;
-   Widget_Data *wd;
-   Eina_List *l;
-
-   if (part && strcmp(part ,"default")) return NULL;
-
-   item = (Elm_Flipselector_Item *) it;
-   wd = elm_widget_data_get(WIDGET(item));
-   if ((!wd) || (!wd->items)) return NULL;
-
-   EINA_LIST_FOREACH(wd->items, l, _item)
-     if (_item == item) return item->label;
-   return NULL;
-=======
    if (part && strcmp(part ,"default")) return NULL;
 
    return ((Elm_Flipselector_Item *)it)->label;
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -145,12 +114,7 @@ _item_signal_emit_hook(Elm_Object_Item *it,
                        const char *emission,
                        const char *source)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it;
-=======
    Elm_Flipselector_Item *item = (Elm_Flipselector_Item *)it;
->>>>>>> remotes/origin/upstream
    edje_object_signal_emit(VIEW(item), emission, source);
 }
 
@@ -207,8 +171,6 @@ _del_hook(Evas_Object *obj)
 }
 
 static void
-<<<<<<< HEAD
-=======
 _disable_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -221,7 +183,6 @@ _disable_hook(Evas_Object *obj)
 }
 
 static void
->>>>>>> remotes/origin/upstream
 _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd;
@@ -265,11 +226,7 @@ _sentinel_eval(Widget_Data *wd)
 
    EINA_LIST_FOREACH(wd->items, l, it)
      {
-<<<<<<< HEAD
-        if (strlen(elm_object_item_text_get((Elm_Object_Item *) it)) >
-=======
         if (strlen(elm_object_item_text_get((Elm_Object_Item *)it)) >
->>>>>>> remotes/origin/upstream
             strlen(elm_object_item_text_get(DATA_GET(wd->sentinel))))
           wd->sentinel = l;
      }
@@ -367,6 +324,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
      return EINA_FALSE;
 
    if (wd->spin) ecore_timer_del(wd->spin);
+   wd->spin = NULL;
 
    /* TODO: if direction setting via API is not coming in, replace
       these calls by flip_{next,prev} */
@@ -413,15 +371,15 @@ _sizing_eval(Evas_Object *obj)
    if (wd->sentinel)
      {
         const char *label = elm_object_item_text_get(DATA_GET(wd->sentinel));
-        tmp = edje_object_part_text_get(wd->base, "top");
-        edje_object_part_text_set(wd->base, "top", label);
+        tmp = edje_object_part_text_get(wd->base, "elm.top");
+        edje_object_part_text_escaped_set(wd->base, "elm.top", label);
      }
 
    edje_object_size_min_restricted_calc(wd->base, &minw, &minh, minw, minh);
    elm_coords_finger_size_adjust(1, &minw, 2, &minh);
    evas_object_size_hint_min_get(obj, &w, &h);
 
-   if (wd->sentinel) edje_object_part_text_set(wd->base, "top", tmp);
+   if (wd->sentinel) edje_object_part_text_escaped_set(wd->base, "elm.top", tmp);
 
    if (w > minw) minw = w;
    if (h > minh) minh = h;
@@ -443,8 +401,8 @@ _update_view(Evas_Object *obj)
    item = DATA_GET(wd->current);
    if (item) label = item->label;
 
-   edje_object_part_text_set(wd->base, "top", label ? label : "");
-   edje_object_part_text_set(wd->base, "bottom", label ? label : "");
+   edje_object_part_text_escaped_set(wd->base, "elm.top", label ? label : "");
+   edje_object_part_text_escaped_set(wd->base, "elm.bottom", label ? label : "");
    edje_object_message_signal_process(wd->base);
 }
 
@@ -618,19 +576,11 @@ _callbacks_set(Evas_Object *obj)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
-<<<<<<< HEAD
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-=======
->>>>>>> remotes/origin/upstream
    Widget_Data *wd;
    Elm_Flipselector_Item *item, *item2;
    Eina_List *l;
 
-<<<<<<< HEAD
-   item = (Elm_Flipselector_Item *) it;
-=======
    item = (Elm_Flipselector_Item *)it;
->>>>>>> remotes/origin/upstream
    wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return EINA_FALSE;
 
@@ -686,11 +636,7 @@ elm_flipselector_add(Evas_Object *parent)
    wd->self = obj;
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
-<<<<<<< HEAD
-   /* TODO: elm_widget_disable_hook_set(obj, _disable_hook); */
-=======
    elm_widget_disable_hook_set(obj, _disable_hook);
->>>>>>> remotes/origin/upstream
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
@@ -718,6 +664,7 @@ elm_flipselector_flip_next(Evas_Object *obj)
    if (!wd) return;
 
    if (wd->spin) ecore_timer_del(wd->spin);
+   wd->spin = NULL;
 
    _flipselector_walk(wd);
    _flip_down(wd);
@@ -733,6 +680,7 @@ elm_flipselector_flip_prev(Evas_Object *obj)
    if (!wd) return;
 
    if (wd->spin) ecore_timer_del(wd->spin);
+   wd->spin = NULL;
 
    _flipselector_walk(wd);
    _flip_up(wd);
@@ -761,11 +709,7 @@ elm_flipselector_item_append(Evas_Object *obj, const char *label, void (*func)(v
      }
 
    if (!wd->sentinel ||
-<<<<<<< HEAD
-       (strlen(elm_object_item_text_get((Elm_Object_Item *) item)) >
-=======
        (strlen(elm_object_item_text_get((Elm_Object_Item *)item)) >
->>>>>>> remotes/origin/upstream
         strlen(elm_object_item_text_get(DATA_GET(wd->sentinel)))))
      {
         wd->sentinel = eina_list_last(wd->items);
@@ -775,11 +719,7 @@ elm_flipselector_item_append(Evas_Object *obj, const char *label, void (*func)(v
    if (eina_list_count(wd->items) >= 2)
      edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm");
 
-<<<<<<< HEAD
-   return (Elm_Object_Item *) item;
-=======
    return (Elm_Object_Item *)item;
->>>>>>> remotes/origin/upstream
 }
 
 EAPI Elm_Object_Item *
@@ -804,11 +744,7 @@ elm_flipselector_item_prepend(Evas_Object *obj, const char *label, void (*func)(
      }
 
    if (!wd->sentinel ||
-<<<<<<< HEAD
-       (strlen(elm_object_item_text_get((Elm_Object_Item *) item)) >
-=======
        (strlen(elm_object_item_text_get((Elm_Object_Item *)item)) >
->>>>>>> remotes/origin/upstream
         strlen(elm_object_item_text_get(DATA_GET(wd->sentinel)))))
      {
         wd->sentinel = wd->items;
@@ -818,16 +754,9 @@ elm_flipselector_item_prepend(Evas_Object *obj, const char *label, void (*func)(
    if (eina_list_count(wd->items) >= 2)
      edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm");
 
-<<<<<<< HEAD
-   return (Elm_Object_Item *) item;
-}
-
-/* TODO: account for deleted items?  */
-=======
    return (Elm_Object_Item *)item;
 }
 
->>>>>>> remotes/origin/upstream
 EAPI const Eina_List *
 elm_flipselector_items_get(const Evas_Object *obj)
 {
@@ -853,11 +782,7 @@ elm_flipselector_first_item_get(const Evas_Object *obj)
    EINA_LIST_FOREACH(wd->items, l, it)
      {
         if (it->deleted) continue;
-<<<<<<< HEAD
-        return (Elm_Object_Item *) it;
-=======
         return (Elm_Object_Item *)it;
->>>>>>> remotes/origin/upstream
      }
    return NULL;
 }
@@ -877,11 +802,7 @@ elm_flipselector_last_item_get(const Evas_Object *obj)
    EINA_LIST_REVERSE_FOREACH(wd->items, l, it)
      {
         if (it->deleted) continue;
-<<<<<<< HEAD
-        return (Elm_Object_Item *) it;
-=======
         return (Elm_Object_Item *)it;
->>>>>>> remotes/origin/upstream
      }
    return NULL;
 }
@@ -892,11 +813,7 @@ elm_flipselector_selected_item_get(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
 
    Widget_Data *wd = elm_widget_data_get(obj);
-<<<<<<< HEAD
-   if (!wd || !wd->current) return NULL;
-=======
    if (!wd) return NULL;
->>>>>>> remotes/origin/upstream
    return DATA_GET(wd->current);
 }
 
@@ -910,11 +827,7 @@ elm_flipselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
    Widget_Data *wd;
    Eina_List *l;
 
-<<<<<<< HEAD
-   item = (Elm_Flipselector_Item *) it;
-=======
    item = (Elm_Flipselector_Item *)it;
->>>>>>> remotes/origin/upstream
    wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return;
 
@@ -960,56 +873,12 @@ elm_flipselector_item_selected_get(const Elm_Object_Item *it)
    Widget_Data *wd;
    Elm_Flipselector_Item *item;
 
-<<<<<<< HEAD
-   item = (Elm_Flipselector_Item *) it;
-=======
    item = (Elm_Flipselector_Item *)it;
->>>>>>> remotes/origin/upstream
    wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return EINA_FALSE;
    return (eina_list_data_get(wd->current) == item);
 }
 
-<<<<<<< HEAD
-EAPI void
-elm_flipselector_item_del(Elm_Object_Item *it)
-{
-   elm_object_item_del(it);
-}
-
-EAPI const char *
-elm_flipselector_item_label_get(const Elm_Object_Item *it)
-{
-   return _item_text_get_hook(it, NULL);
-}
-
-EAPI void
-elm_flipselector_item_label_set(Elm_Object_Item *it, const char *label)
-{
-   _item_text_set_hook(it, NULL, label);
-}
-
-EAPI Elm_Object_Item *
-elm_flipselector_item_prev_get(Elm_Object_Item *it)
-{
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-
-   Elm_Flipselector_Item *item, *_item;
-   Widget_Data *wd;
-   Eina_List *l;
-
-   item = (Elm_Flipselector_Item *) it;
-   wd = elm_widget_data_get(WIDGET(item));
-   if ((!wd) || (!wd->items)) return NULL;
-
-   EINA_LIST_FOREACH(wd->items, l, _item)
-     if (_item == item)
-       {
-          l = eina_list_prev(l);
-          if (!l) return NULL;
-          return DATA_GET(l);
-       }
-=======
 EAPI Elm_Object_Item *
 elm_flipselector_item_prev_get(const Elm_Object_Item *it)
 {
@@ -1025,32 +894,10 @@ elm_flipselector_item_prev_get(const Elm_Object_Item *it)
    l = eina_list_data_find_list(wd->items, it);
    if (l && l->prev) return DATA_GET(l->prev);
 
->>>>>>> remotes/origin/upstream
    return NULL;
 }
 
 EAPI Elm_Object_Item *
-<<<<<<< HEAD
-elm_flipselector_item_next_get(Elm_Object_Item *it)
-{
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-
-   Elm_Flipselector_Item *item, *_item;
-   Widget_Data *wd;
-   Eina_List *l;
-
-   item = (Elm_Flipselector_Item *) it;
-   wd = elm_widget_data_get(WIDGET(item));
-   if ((!wd) || (!wd->items)) return NULL;
-
-   EINA_LIST_FOREACH(wd->items, l, _item)
-     if (_item == item)
-       {
-          l = eina_list_next(l);
-          if (!l) return NULL;
-          return DATA_GET(l);
-       }
-=======
 elm_flipselector_item_next_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
@@ -1065,16 +912,11 @@ elm_flipselector_item_next_get(const Elm_Object_Item *it)
    l = eina_list_data_find_list(wd->items, it);
    if (l && l->next) return DATA_GET(l->next);
 
->>>>>>> remotes/origin/upstream
    return NULL;
 }
 
 EAPI void
-<<<<<<< HEAD
-elm_flipselector_interval_set(Evas_Object *obj, double interval)
-=======
 elm_flipselector_first_interval_set(Evas_Object *obj, double interval)
->>>>>>> remotes/origin/upstream
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
 
@@ -1084,33 +926,11 @@ elm_flipselector_first_interval_set(Evas_Object *obj, double interval)
 }
 
 EAPI double
-<<<<<<< HEAD
-elm_flipselector_interval_get(const Evas_Object *obj)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype) 0.0;
-=======
 elm_flipselector_first_interval_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) 0;
->>>>>>> remotes/origin/upstream
 
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return 0;
    return wd->first_interval;
 }
-<<<<<<< HEAD
-=======
-
-EINA_DEPRECATED EAPI void
-elm_flipselector_interval_set(Evas_Object *obj, double interval)
-{
-   elm_flipselector_first_interval_set(obj, interval);
-}
-
-EINA_DEPRECATED EAPI double
-elm_flipselector_interval_get(const Evas_Object *obj)
-{
-   return elm_flipselector_first_interval_get(obj);
-}
-
->>>>>>> remotes/origin/upstream