Merge "Updated the implementation of calendar's min-max year set API as it was needed...
authorRajeev Ranjan <rajeev.r@samsung.com>
Wed, 16 Mar 2011 08:31:05 +0000 (17:31 +0900)
committerGerrit Code Review <git@Taebaek>
Wed, 16 Mar 2011 08:31:05 +0000 (17:31 +0900)
12 files changed:
TC/elm_ts/colorpalette/utc_UIFW_elm_colorpalette_add_func.c
TC/elm_ts/colorpalette/utc_UIFW_elm_colorpalette_color_set_func.c
TC/elm_ts/colorpalette/utc_UIFW_elm_colorpalette_row_column_set_func.c
TC/elm_ts/colorselector/Makefile [new file with mode: 0755]
TC/elm_ts/colorselector/utc_UIFW_elm_colorselector_add_func.c
TC/elm_ts/colorselector/utc_UIFW_elm_colorselector_color_get_func.c
TC/elm_ts/colorselector/utc_UIFW_elm_colorselector_color_set_func.c
debian/changelog
src/edje_externals/elm_colorpalette.c
src/lib/elm_entry.c
src/lib/elm_index.c
src/lib/elm_slider.c

index 232802e..954efdd 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_colorpalette_add_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_colorpalette_add_func_02, NEGATIVE_TC_IDX },
+       { NULL, 0 }
 };
 
 static void startup(void)
index a68ef3a..2c57ce9 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_colorpalette_color_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_colorpalette_color_set_func_02, NEGATIVE_TC_IDX },
+       { NULL, 0 }
 };
 
 static void startup(void)
index a49c88a..68d3d12 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_colorpalette_row_column_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_colorpalette_row_column_set_func_02, NEGATIVE_TC_IDX },
+        { NULL, 0 }
 };
 
 static void startup(void)
diff --git a/TC/elm_ts/colorselector/Makefile b/TC/elm_ts/colorselector/Makefile
new file mode 100755 (executable)
index 0000000..0c2bf31
--- /dev/null
@@ -0,0 +1,26 @@
+CC ?= gcc
+
+TARGETS = utc_UIFW_elm_colorselector_add_func \
+         utc_UIFW_elm_colorselector_color_set_func \
+         utc_UIFW_elm_colorselector_color_get_func
+
+PKGS = elementary
+
+LDFLAGS = `pkg-config --libs $(PKGS)`
+LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s
+
+CFLAGS = -I. `pkg-config --cflags $(PKGS)`
+CFLAGS += -I$(TET_ROOT)/inc/tet3
+CFLAGS += -Wall
+
+all: $(TARGETS)
+
+$(TARGET): %: %.c
+       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+
+clean:
+       rm -f $(TARGETS)
+       rm -f tet_captured 
+       rm -f *~
index b18aa29..6a3e7eb 100644 (file)
@@ -46,6 +46,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_colorselector_add_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_colorselector_add_func_02, NEGATIVE_TC_IDX },
+       { NULL, 0 }
 };
 
 static void startup(void)
index bf4b136..5d261d5 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_colorselector_color_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_colorselector_color_get_func_02, NEGATIVE_TC_IDX },
+       { NULL, 0 }
 };
 
 static void startup(void)
index c300d19..4ad4c09 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_colorselector_color_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_colorselector_color_set_func_02, NEGATIVE_TC_IDX },
+       { NULL, 0 }
 };
 
 static void startup(void)
index 7ab5312..b92c825 100644 (file)
@@ -1,3 +1,11 @@
+elementary (1.0.0+svn.51480slp2+build128) unstable; urgency=low
+
+  * Upload Package
+  * Git: 165.213.180.234:/slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.51480slp2+build128
+
+ -- WooHyun Jung <wh0705.jung@samsung.com>  Wed, 16 Mar 2011 10:51:14 +0900
+
 elementary (1.0.0+svn.51480slp2+build127) unstable; urgency=low
 
   * Package Upload
index c2788e8..d49dba9 100644 (file)
@@ -74,6 +74,7 @@ external_colorpalette_params_parse(void *data __UNUSED__, Evas_Object *obj, cons
    k = m = ll = 0;
    char test[5] ;
    int d = 0;
+   char *s = NULL ;
    mem = calloc(1, sizeof(Elm_Params_colorpalette));
    if (!mem)
      return NULL;
@@ -96,9 +97,8 @@ external_colorpalette_params_parse(void *data __UNUSED__, Evas_Object *obj, cons
           else if (!strcmp(param->name, "color_set"))
          {
            mem->color = (Elm_Colorpalette_Color*) calloc (mem->color_num, sizeof(Elm_Colorpalette_Color));
-           char *s = NULL ;
            s = (char*)param->i;
-           while(k <(mem->color_num) && (ll <= (char*)strlen(param->i)))
+           while(k <(mem->color_num) && (ll <= strlen(s)))
              {
                   if(d == 0)
                    {
index b3ab5ec..c899f7b 100644 (file)
@@ -1701,7 +1701,14 @@ _signal_anchor_down(void *data, Evas_Object *obj __UNUSED__, const char *emissio
 }
 
 static void
-_signal_anchor_up(void *data, Evas_Object *obj __UNUSED__, const char *emission, const char *source __UNUSED__)
+_signal_anchor_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   if (!wd) return;
+}
+
+static void
+_signal_anchor_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission, const char *source __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Elm_Entry_Anchor_Info ei;
@@ -2501,6 +2508,8 @@ elm_entry_add(Evas_Object *parent)
                                    _signal_anchor_down, obj);
    edje_object_signal_callback_add(wd->ent, "anchor,mouse,up,*", "elm.text",
                                    _signal_anchor_up, obj);
+   edje_object_signal_callback_add(wd->ent, "anchor,mouse,clicked,*", "elm.text",
+                                   _signal_anchor_clicked, obj);
    edje_object_signal_callback_add(wd->ent, "anchor,mouse,move,*", "elm.text",
                                    _signal_anchor_move, obj);
    edje_object_signal_callback_add(wd->ent, "anchor,mouse,in,*", "elm.text",
index 7608559..62975c1 100644 (file)
 #define MIN_GRP_SIZE 2 //for symmetry it is 2, otherwise it can be 1 and zero have no meaning.
 #define MIN_PIXEL_VALUE 1 //Min pixel value is highly dependent on touch sensitivity support.
 #define MIN_OBJ_HEIGHT 24 //should be taken from .edc file.
+
+/*
+ *  use for find view toplevel
+ */
+#define SET_VIEW_LEVEL(wd, view_level)\
+   view_level = wd->level;\
+   while ((!wd->tot_items_count[view_level]) && view_level)\
+     {\
+        view_level--; \
+     }
+
 typedef struct _Widget_Data Widget_Data;
 
 typedef struct _PlacementPart PlacementPart;
@@ -182,8 +193,8 @@ _item_new(Evas_Object *obj, const char *letter, const void *item)
      it->size =  wd->min_1st_level_obj_height;
    if(letter)
      {
-         it->letter = eina_stringshare_add(letter);
-         it->vis_letter = eina_stringshare_add(letter);
+        it->letter = eina_stringshare_add(letter);
+        it->vis_letter = eina_stringshare_add(letter);
      }
    else
      return NULL;
@@ -232,7 +243,7 @@ _index_box_auto_fill(Evas_Object *obj, Evas_Object *box, int level)
         const char *stacking;
 
         if (it->level != level) continue;
-       if(i > wd->max_supp_items_count) break;
+        if(i > wd->max_supp_items_count) break;
 
         o = edje_object_add(evas_object_evas_get(obj));
         it->base = o;
@@ -260,7 +271,7 @@ _index_box_auto_fill(Evas_Object *obj, Evas_Object *box, int level)
         evas_object_show(o);
         i++;
         if(level == 1)
-               wd->tot_items_count[1] = i;
+          wd->tot_items_count[1] = i;
         evas_object_smart_calculate(box); // force a calc so we know the size
         evas_object_size_hint_min_get(box, &mw, &mh);
         if (mh > h)
@@ -299,9 +310,11 @@ _delay_change(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    void *d;
+   int view_level;
    if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->delay = NULL;
-   d = (void *)elm_index_item_selected_get(data, wd->level);
+   SET_VIEW_LEVEL(wd, view_level);
+   d = (void *)elm_index_item_selected_get(data, view_level);
    if (d) evas_object_smart_callback_call(data, "delay,changed", d);
    return ECORE_CALLBACK_CANCEL;
 }
@@ -321,8 +334,11 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
    Eina_Bool change = EINA_FALSE;
    char *label = NULL, *last = NULL;
    int i;
+   int view_level;
    if (!wd) return;
-   for (i = 0; i <= wd->level; i++)
+
+   SET_VIEW_LEVEL(wd, view_level);
+   for (i = 0; i <= view_level; i++)
      {
         it_last = NULL;
         it_closest  = NULL;
@@ -354,17 +370,17 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
                   dist = x;
                }
           }
-          if ((i == 0) && (wd->level == 0))
+          if ((i == 0) && (view_level == 0))
             {
                if(cdv > dmax || cdv < dmin)
                  {
                     if(cdv > dmax)
                       {
-                          cdvv = dmax;
+                         cdvv = dmax;
                       }
                     else
                       {
-                          cdvv = dmin;
+                         cdvv = dmin;
                       }
                     edje_object_part_drag_value_set(wd->base, "elm.dragable.index.1", cdv, cdvv);
                  }
@@ -382,7 +398,7 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
                   const char *stacking, *selectraise;
 
                   it = it_last;
-                  if(wd->level == it->level)
+                  if(view_level == it->level)
                   edje_object_signal_emit(it->base, "elm,state,inactive", "elm");
                   stacking = edje_object_data_get(it->base, "stacking");
                   selectraise = edje_object_data_get(it->base, "selectraise");
@@ -397,7 +413,7 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
                   const char *selectraise;
 
                   it = it_closest;
-                  if(wd->level == it->level)
+                  if(view_level == it->level)
                   edje_object_signal_emit(it->base, "elm,state,active", "elm");
                   selectraise = edje_object_data_get(it->base, "selectraise");
                   if ((selectraise) && (!strcmp(selectraise, "on")))
@@ -429,25 +445,25 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
    if (!last) last = strdup("");
    if(!wd->hide_button)
      {
-        if(wd->level == 0)
+        if(view_level == 0)
           {
              if(last)
                {
                   edje_object_part_text_set(wd->base, "elm.text.body", last);
-                         edje_object_signal_emit(wd->base, "hide_2nd_level", "");
-              }
-                 }
-        if( wd->level == 1 && wd->level_active[1])
+                  edje_object_signal_emit(wd->base, "hide_2nd_level", "");
+               }
+          }
+        if(view_level == 1 && wd->level_active[1])
           {
              edje_object_part_text_set(wd->base, "elm.text", last);
-            edje_object_signal_emit(wd->base, "hide_first_level", "");
-         }
+             edje_object_signal_emit(wd->base, "hide_first_level", "");
+          }
      }
 
    if(label)
-      free(label);
+     free(label);
    if(last)
-      free(last);
+     free(last);
 }
 
 static void
@@ -482,15 +498,18 @@ _mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event
    void *d;
    Elm_Index_Item *it;
    Eina_List *l;
+   int view_level;
+
    if (!wd) return;
    if (ev->button != 1) return;
    if (wd->level == 1 && wd->delay) ecore_timer_del(wd->delay);
    wd->delay = NULL;
    wd->down = 0;
-   d = (void *)elm_index_item_selected_get(data, wd->level);
+   SET_VIEW_LEVEL(wd, view_level);
+   d = (void *)elm_index_item_selected_get(data, view_level);
    EINA_LIST_FOREACH(wd->items, l, it)
      {
-         edje_object_signal_emit(it->base, "elm,state,inactive", "elm");
+        edje_object_signal_emit(it->base, "elm,state,inactive", "elm");
      }
    if (d) evas_object_smart_callback_call(data, "selected", d);
    elm_index_active_set(data, 0);
@@ -577,16 +596,16 @@ _index_box_refill_job(void *data)
 
    if(pw != wd->pwidth && ph != wd->pheight)
      {
-       if(wd->down == 1)
-         {
-            wd->active = 0;
-            elm_index_active_set(data, 1);
-         }
-       _index_box_clear((Evas_Object *)data, wd->bx[0], 0);
-       evas_object_smart_calculate( wd->bx[0]);
-       elm_index_item_go((Evas_Object *)data, wd->level);
-       wd->pwidth = pw;
-       wd->pheight = ph;
+        if(wd->down == 1)
+          {
+             wd->active = 0;
+             elm_index_active_set(data, 1);
+          }
+        _index_box_clear((Evas_Object *)data, wd->bx[0], 0);
+        evas_object_smart_calculate( wd->bx[0]);
+        elm_index_item_go((Evas_Object *)data, wd->level);
+        wd->pwidth = pw;
+        wd->pheight = ph;
      }
 }
 
@@ -675,17 +694,18 @@ elm_index_add(Evas_Object *parent)
 
    if (edje_object_part_exists(wd->base, "elm.swallow.index.1"))
      {
-       wd->bx[1] = evas_object_box_add(e);
-       evas_object_box_layout_set(wd->bx[1], _layout, wd, NULL);
-       elm_widget_sub_object_add(obj, wd->bx[1]);
-       edje_object_part_swallow(wd->base, "elm.swallow.index.1", wd->bx[1]);
-       evas_object_show(wd->bx[1]);
+        wd->bx[1] = evas_object_box_add(e);
+        evas_object_box_layout_set(wd->bx[1], _layout, wd, NULL);
+        elm_widget_sub_object_add(obj, wd->bx[1]);
+        edje_object_part_swallow(wd->base, "elm.swallow.index.1", wd->bx[1]);
+        evas_object_show(wd->bx[1]);
      }
 
    wd->scale_factor = elm_scale_get();
-   if ( wd->scale_factor == 0.0 ) {
-       wd->scale_factor = 1.0;
-   }
+   if ( wd->scale_factor == 0.0 )
+     {
+        wd->scale_factor = 1.0;
+     }
    string = edje_object_data_get(wd->base, "min_1st_level_obj_height");
    if(string)
      wd->min_1st_level_obj_height = (int) (atoi(string))*wd->scale_factor;
@@ -703,14 +723,14 @@ _group_count(Evas_Object *obj, int extraIndex, int adj_pos, int vis_pos)
    int group_count = MIN_GRP_SIZE;
    while(group_count <= wd->max_grp_size)
      {
-       if(extraIndex <= wd->max_grp_size*adj_pos)
-         {
-            if(group_count*adj_pos>=extraIndex) return group_count;
-         }
-       else
-         return wd->max_grp_size;
-
-       group_count += MIN_GRP_SIZE;
+        if(extraIndex <= wd->max_grp_size*adj_pos)
+          {
+             if(group_count*adj_pos>=extraIndex) return group_count;
+          }
+        else
+          return wd->max_grp_size;
+
+        group_count += MIN_GRP_SIZE;
      }
    return group_count;
 }
@@ -828,7 +848,7 @@ elm_index_active_set(Evas_Object *obj, Eina_Bool active)
    if (wd->active)
      {
         _index_box_clear(obj, wd->bx[1], 1);
-       _index_process(obj);
+        _index_process(obj);
         _index_box_auto_fill(obj, wd->bx[0], 0);
         edje_object_signal_emit(wd->base, "elm,state,active", "elm");
      }
@@ -1056,16 +1076,16 @@ elm_index_item_sorted_insert(Evas_Object *obj, const char *letter, const void *i
      wd->items = eina_list_prepend_relative_list(wd->items, it, lnear);
    else
      {
-       /* If cmp_data_func is not provided, append a duplicated item */
-       if (!cmp_data_func)
-         wd->items =  eina_list_append_relative_list(wd->items, it, lnear);
-       else
-         {
-            Elm_Index_Item *p_it = eina_list_data_get(lnear);
-            if (cmp_data_func(p_it->data, it->data) >= 0)
-              p_it->data = it->data;
-            _item_free(it);
-         }
+        /* If cmp_data_func is not provided, append a duplicated item */
+        if (!cmp_data_func)
+          wd->items =  eina_list_append_relative_list(wd->items, it, lnear);
+        else
+          {
+             Elm_Index_Item *p_it = eina_list_data_get(lnear);
+             if (cmp_data_func(p_it->data, it->data) >= 0)
+               p_it->data = it->data;
+             _item_free(it);
+          }
      }
 
    _index_box_clear(obj, wd->bx[wd->level], wd->level);
@@ -1132,10 +1152,11 @@ elm_index_item_clear(Evas_Object *obj)
         if (it->level != wd->level) continue;
         clear = eina_list_append(clear, it);
      }
-   EINA_LIST_FREE(clear, it) {
-          _item_free(it);
-          wd->tot_items_count[wd->level]--;
-   }
+   EINA_LIST_FREE(clear, it)
+     {
+        _item_free(it);
+        wd->tot_items_count[wd->level]--;
+     }
 }
 
 /**
@@ -1220,7 +1241,7 @@ elm_index_button_image_invisible_set(Evas_Object *obj, Eina_Bool invisible)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    wd->hide_button = invisible;
-   
+
    edje_object_signal_emit(wd->base, "elm,state,button,image,hide", "elm");
    return;
 }
index b3aa998..7007cab 100644 (file)
@@ -399,7 +399,7 @@ _drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUS
    edje_object_message_signal_process(wd->slider); 
    _units_set(data);
    _indicator_set(data);
-   elm_widget_scroll_hold_push(data);
+   elm_widget_scroll_freeze_push(data);
 }
 
 static void
@@ -410,7 +410,7 @@ _drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE
    evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
    _units_set(data);
    _indicator_set(data);
-   elm_widget_scroll_hold_pop(data);
+   elm_widget_scroll_freeze_pop(data);
 }
 
 static void