Merge changes Idfd11a5b,I02aab7c1
authorPrince Kr Dubey <prince.dubey@samsung.com>
Wed, 16 Mar 2011 09:53:11 +0000 (18:53 +0900)
committerGerrit Code Review <git@Taebaek>
Wed, 16 Mar 2011 09:53:11 +0000 (18:53 +0900)
* changes:
  [Progressbar] Makefile Added.
  Review is updated. [TC] Updated. Warnings/Errors are removed.

49 files changed:
TC/elm_ts/calendar/utc_UIFW_elm_calendar_add_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_day_selection_enabled_get_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_day_selection_enabled_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_format_function_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_interval_get_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_interval_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_mark_add_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_mark_del_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_marks_clear_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_marks_draw_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_marks_get_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_min_max_year_get_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_min_max_year_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_selected_time_get_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_selected_time_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_text_saturday_color_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_text_sunday_color_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_text_weekday_color_set_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_weekdays_names_get_func.c
TC/elm_ts/calendar/utc_UIFW_elm_calendar_weekdays_names_set_func.c
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
TC/elm_ts/datefield/utc_UIFW_elm_datefield_add_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_format_get_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_format_set_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_get_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_set_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_input_panel_state_callback_add_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_input_panel_state_callback_del_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_layout_get_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_layout_set_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_time_mode_get_func.c
TC/elm_ts/datefield/utc_UIFW_elm_datefield_time_mode_set_func.c
TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c
TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c
TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_set_func.c
debian/changelog
src/edje_externals/elm_colorpalette.c
src/lib/elm_calendar.c
src/lib/elm_controlbar.c
src/lib/elm_entry.c
src/lib/elm_index.c
src/lib/elm_navigationbar_ex.c
src/lib/elm_slider.c

index d6de5aa..320ee05 100644 (file)
@@ -46,6 +46,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_add_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_add_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index df52601..ce2a768 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_day_selection_enabled_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_day_selection_enabled_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 18d9df7..2731026 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_day_selection_enabled_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_day_selection_enabled_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 71d65b0..48b94e5 100644 (file)
@@ -46,6 +46,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_format_function_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_format_function_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 7370a32..9a60fed 100644 (file)
@@ -48,6 +48,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_interval_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_interval_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 99ee3c7..882dc26 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_interval_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_interval_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 4fd0aa3..0ca018d 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_mark_add_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_mark_add_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 212898b..d3ac17a 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_mark_del_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_mark_del_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 29be6b7..5c09d56 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_marks_clear_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_marks_clear_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index b9a027e..b001483 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_marks_draw_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_marks_draw_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 4d7f894..e0ff3c6 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_marks_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_marks_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index c5b2dd3..06a30b1 100644 (file)
@@ -30,7 +30,7 @@
 Evas_Object *main_win;
 Evas_Object *test_eo = NULL;
 static int min_year = 2010;
-static int max_year = 2010;
+static int max_year = 2020;
 
 static void startup(void);
 static void cleanup(void);
@@ -49,6 +49,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_min_max_year_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_min_max_year_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 7a04629..d6c1a4d 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_min_max_year_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_min_max_year_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index f448ce3..9b5f2cd 100644 (file)
@@ -48,6 +48,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_selected_time_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_selected_time_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index a9fbbc7..85b241a 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_selected_time_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_selected_time_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index f050e20..471f391 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_text_saturday_color_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_text_saturday_color_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index ccfdece..b587b8f 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_text_sunday_color_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_text_sunday_color_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index ef0da94..a374a6f 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_text_weekday_color_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_text_weekday_color_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index fc2b7f5..5b341b4 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_weekdays_names_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_weekdays_names_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 94bd59d..2523abe 100644 (file)
@@ -45,6 +45,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_calendar_weekdays_names_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_calendar_weekdays_names_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
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 b8243df..24efd36 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_add_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_add_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 7d486fa..179d8b1 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_date_format_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_date_format_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
@@ -104,7 +105,7 @@ static void utc_UIFW_elm_datefield_date_format_get_func_02(void)
        datefield = elm_datefield_add(main_win);
        format = elm_datefield_date_format_get(NULL);
 
-       if (!strcmp(format, "mmddyy")) {
+       if (format) {
                tet_infoline("elm_datefield_date_format_get() failed in negative test case");
                tet_result(TET_FAIL);
                return;
index dffa4f8..51c2e08 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_date_format_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_date_format_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 78f90a8..32d518b 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_date_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_date_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 172838a..d2165eb 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_date_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_date_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index bc50ed3..5cdd3c9 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_input_panel_state_callback_add_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_input_panel_state_callback_add_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 8a9c64c..8aa530a 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_input_panel_state_callback_del_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_input_panel_state_callback_del_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 909c6ad..032524a 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_layout_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_layout_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index dc64c29..3ad28a5 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_layout_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_layout_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index ce5f5f7..cb3b413 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_time_mode_get_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_time_mode_get_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
index 0cf0dbb..e9716bb 100644 (file)
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_datefield_time_mode_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_datefield_time_mode_set_func_02, NEGATIVE_TC_IDX },
+    { NULL, 0 }
 };
 
 static void startup(void)
@@ -98,14 +99,7 @@ static void utc_UIFW_elm_datefield_time_mode_set_func_01(void)
 static void utc_UIFW_elm_datefield_time_mode_set_func_02(void)
 {
        datefield = elm_datefield_add(main_win);
-       elm_datefield_time_mode_set(datefield, 2);
-       
-       if (!(elm_datefield_time_mode_get(datefield) == EINA_TRUE || elm_datefield_time_mode_get == EINA_FALSE)) {
-               tet_infoline("elm_datefield_time_mode_set() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-
+       elm_datefield_time_mode_set(NULL, EINA_TRUE);
        evas_object_resize(datefield, 480, 80);
        evas_object_move(datefield, 0, 40);
        evas_object_show(datefield);
index ce5bc54..a2fbc27 100644 (file)
@@ -55,13 +55,10 @@ static void startup(void)
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);     
        popup = elm_popup_add(main_win);
-       Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
-       elm_icon_file_set(icon, buf, NULL);
-       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       elm_icon_scale_set(icon, 1, 1);
+       Evas_Object *content = elm_button_add(popup);
+       evas_object_show(content);
        
-       elm_popup_content_set(popup,icon);
+       elm_popup_content_set(popup,content);
        evas_object_show(popup);        
 }
 
index fd544f7..81a9aaa 100644 (file)
@@ -1,6 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
-
+#define ICON_DIR "usr/share/elementary/images"
 // Definitions
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
@@ -51,13 +51,14 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[PATH_MAX];
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);     
        popup = elm_popup_add(main_win);
        Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
        elm_icon_file_set(icon, buf, NULL);
        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
        elm_icon_scale_set(icon, 1, 1);
index e4a2c24..da338b5 100644 (file)
@@ -1,7 +1,7 @@
 #include <tet_api.h>
 #include <Elementary.h>
 
-#define ICON_DIR "usr/share/beat_winset_test/icon"
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -82,7 +82,7 @@ static void utc_UIFW_elm_popup_title_icon_set_func_01(void)
 {
        
        Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
        elm_icon_file_set(icon, buf, NULL);
        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
        elm_icon_scale_set(icon, 1, 1);
@@ -98,7 +98,7 @@ static void utc_UIFW_elm_popup_title_icon_set_func_02(void)
 {
        
        Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
        elm_icon_file_set(icon, buf, NULL);
        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
        elm_icon_scale_set(icon, 1, 1);
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 8656945..95e9072 100644 (file)
@@ -902,6 +902,10 @@ elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max)
    max -= 1900;
    if ((wd->year_min == min) && (wd->year_max == max)) return;
    wd->year_min = min > 2 ? min : 2;
+   if (max > wd->year_min)
+         wd->year_max = max;
+   else
+         wd->year_max = wd->year_min;
    if (wd->selected_time.tm_year > wd->year_max)
      wd->selected_time.tm_year = wd->year_max;
    if (wd->selected_time.tm_year < wd->year_min)
index 7c7e5d3..3a7a67e 100644 (file)
@@ -4,7 +4,7 @@
  *
  * This is a Controlbar. It can contain label and icon objects.
  * In edit mode, you can change the location of items.
- */  
+ */
 
 #include <string.h>
 #include <math.h>
@@ -25,7 +25,7 @@
 
 typedef struct _Animation_Data Animation_Data;
 
-struct _Animation_Data 
+struct _Animation_Data
 {
    Evas_Object * obj;
    Evas_Coord fx;
@@ -46,7 +46,7 @@ struct _Animation_Data
 // internal data structure of controlbar object
 typedef struct _Widget_Data Widget_Data;
 
-struct _Widget_Data 
+struct _Widget_Data
 {
    Evas_Object * object;
    Evas_Object * parent;
@@ -80,13 +80,13 @@ struct _Widget_Data
    Eina_Bool selected_animation;
    Animation_Data *ad;
 
-//   const char *view_hide;
-//   const char *view_show;
+   //   const char *view_hide;
+   //   const char *view_show;
    const char *pressed_signal;
    const char *selected_signal;
 };
 
-struct _Elm_Controlbar_Item 
+struct _Elm_Controlbar_Item
 {
    Evas_Object * obj;
    Evas_Object * base;
@@ -121,7 +121,7 @@ static void item_color_set(Elm_Controlbar_Item *item, const char *color_part);
 ////////////////////////////////////////////////////////////////////
 
 static void
-_controlbar_move(void *data, Evas_Object * obj) 
+_controlbar_move(void *data, Evas_Object * obj)
 {
    Widget_Data * wd;
    Evas_Coord x, y, x_, y_, width;
@@ -148,7 +148,7 @@ _controlbar_move(void *data, Evas_Object * obj)
 }
 
 static void
-_controlbar_resize(void *data, Evas_Object * obj) 
+_controlbar_resize(void *data, Evas_Object * obj)
 {
    Widget_Data * wd;
    Elm_Controlbar_Item *item;
@@ -193,21 +193,21 @@ _controlbar_resize(void *data, Evas_Object * obj)
 
 static void
 _controlbar_object_move(void *data, Evas * e, Evas_Object * obj,
-                        void *event_info) 
+                        void *event_info)
 {
    _controlbar_move(data, obj);
 }
 
 static void
 _controlbar_object_resize(void *data, Evas * e, Evas_Object * obj,
-                          void *event_info) 
+                          void *event_info)
 {
    _controlbar_resize(data, obj);
 }
 
 static void
 _controlbar_object_show(void *data, Evas * e, Evas_Object * obj,
-                        void *event_info) 
+                        void *event_info)
 {
    Widget_Data * wd;
    if (!data) return;
@@ -221,7 +221,7 @@ _controlbar_object_show(void *data, Evas * e, Evas_Object * obj,
 
 static void
 _controlbar_object_hide(void *data, Evas * e, Evas_Object * obj,
-                        void *event_info) 
+                        void *event_info)
 {
    Widget_Data * wd;
    if (!data) return;
@@ -243,35 +243,35 @@ _item_del(Elm_Controlbar_Item *it)
    if(!wd) return;
 
    if(it == wd->more_item)
-      if(it->view) 
-         evas_object_del(it->view);
+     if(it->view)
+       evas_object_del(it->view);
    if (it->text)
-      eina_stringshare_del(it->text);
+     eina_stringshare_del(it->text);
    if (it->label)
-      evas_object_del(it->label);
+     evas_object_del(it->label);
    if (it->icon_path)
-      eina_stringshare_del(it->icon_path);
+     eina_stringshare_del(it->icon_path);
    if (it->icon)
-      evas_object_del(it->icon);
+     evas_object_del(it->icon);
    if (it->icon_shadow)
-      evas_object_del(it->icon_shadow);
+     evas_object_del(it->icon_shadow);
    if (it->base)
      {
         if (it->style != OBJECT)
-           evas_object_del(it->base);
+          evas_object_del(it->base);
         else
-           evas_object_hide(it->base);
+          evas_object_hide(it->base);
      }
    if (it->base_item)
-      evas_object_del(it->base_item);
+     evas_object_del(it->base_item);
    if (it->view)
      {
         evas_object_hide(it->view);
      }
 }
 
-static void 
-_del_hook(Evas_Object * obj) 
+static void
+_del_hook(Evas_Object * obj)
 {
    Widget_Data * wd = elm_widget_data_get(obj);
    Elm_Controlbar_Item * item;
@@ -335,8 +335,8 @@ _del_hook(Evas_Object * obj)
    wd = NULL;
 }
 
-static void 
-_theme_hook(Evas_Object * obj) 
+static void
+_theme_hook(Evas_Object * obj)
 {
    const Eina_List *l;
 
@@ -361,15 +361,15 @@ _theme_hook(Evas_Object * obj)
           {
              elm_layout_theme_set(item->base, "controlbar", "item_bg", elm_widget_style_get(obj));
              if (item->label && item->icon)
-                  edje_object_signal_emit(_EDJ(item->base_item), "elm,state,icon_text", "elm");
+               edje_object_signal_emit(_EDJ(item->base_item), "elm,state,icon_text", "elm");
              if (item->selected)
-                  selected_box(item);
+               selected_box(item);
           }
      }
 }
 
-static void 
-_sub_del(void *data, Evas_Object * obj, void *event_info) 
+static void
+_sub_del(void *data, Evas_Object * obj, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Object *sub = event_info;
@@ -383,8 +383,8 @@ _sub_del(void *data, Evas_Object * obj, void *event_info)
      }
 }
 
-static void 
-_sizing_eval(Evas_Object * obj) 
+static void
+_sizing_eval(Evas_Object * obj)
 {
    Widget_Data * wd = elm_widget_data_get(obj);
    if (!wd) return;
@@ -399,7 +399,7 @@ _sizing_eval(Evas_Object * obj)
 /////////////////////////////////////////////////////////////
 
 static unsigned int
-current_time_get() 
+current_time_get()
 {
    struct timeval timev;
 
@@ -408,7 +408,7 @@ current_time_get()
 }
 
 static Eina_Bool
-move_evas_object(void *data) 
+move_evas_object(void *data)
 {
    double t;
 
@@ -450,7 +450,7 @@ move_evas_object(void *data)
         evas_object_resize(ad->obj, pw, ph);
         evas_object_show(ad->obj);
         if (ad->func != NULL)
-           ad->func(ad->data, ad->obj);
+          ad->func(ad->data, ad->obj);
         return ECORE_CALLBACK_CANCEL;
      }
    else
@@ -462,13 +462,13 @@ move_evas_object(void *data)
    return ECORE_CALLBACK_RENEW;
 }
 
-static Animation_Data* 
+static Animation_Data*
 move_object_with_animation(Evas_Object * obj, Evas_Coord x, Evas_Coord y,
                            Evas_Coord w, Evas_Coord h, Evas_Coord x_,
                            Evas_Coord y_, Evas_Coord w_, Evas_Coord h_,
                            double time, Eina_Bool (*mv_func) (void *data),
                            void (*func) (void *data,
-                                         Evas_Object * obj), void *data) 
+                                         Evas_Object * obj), void *data)
 {
    Animation_Data * ad = (Animation_Data *) malloc(sizeof(Animation_Data));
    ad->obj = obj;
@@ -507,7 +507,7 @@ item_animation_effect(void *data)
              rand = random()%4;
              switch(rand)
                {
-                case 0: 
+                case 0:
                    break;
                 case 1:
                    break;
@@ -532,7 +532,7 @@ item_animation_effect(void *data)
 /////////////////////////////////////////////////////////////
 
 static int
-sort_cb(const void *d1, const void *d2) 
+sort_cb(const void *d1, const void *d2)
 {
    Elm_Controlbar_Item * item1, *item2;
    item1 = (Elm_Controlbar_Item *) d1;
@@ -575,17 +575,17 @@ check_background(Widget_Data *wd)
         if(it->style == TABBAR)
           {
              if(wd->mode == ELM_CONTROLBAR_MODE_LEFT)
-                edje_object_signal_emit(wd->bg, "elm,state,tabbar_left", "elm");
+               edje_object_signal_emit(wd->bg, "elm,state,tabbar_left", "elm");
              else if(wd->mode == ELM_CONTROLBAR_MODE_RIGHT)
-                edje_object_signal_emit(wd->bg, "elm,state,tabbar_right", "elm");
+               edje_object_signal_emit(wd->bg, "elm,state,tabbar_right", "elm");
              else
-                edje_object_signal_emit(wd->bg, "elm,state,tabbar", "elm");
+               edje_object_signal_emit(wd->bg, "elm,state,tabbar", "elm");
              return;
           }
      }
    edje_object_signal_emit(wd->bg, "elm,state,toolbar", "elm");
 }
-                
+
 
 static void
 check_toolbar_line(Widget_Data *wd)
@@ -649,7 +649,7 @@ check_bar_item_number(Widget_Data *wd)
 }
 
 static void
-item_insert_in_bar(Elm_Controlbar_Item * it, int order) 
+item_insert_in_bar(Elm_Controlbar_Item * it, int order)
 {
    const Eina_List *l;
    Elm_Controlbar_Item * item;
@@ -661,39 +661,39 @@ item_insert_in_bar(Elm_Controlbar_Item * it, int order)
    EINA_LIST_FOREACH(wd->items, l, item)
      {
         if (item->order == order && item != it)
-           check = 1;
+          check = 1;
      }
    if (check)
      {
         EINA_LIST_FOREACH(wd->items, l, item)
           {
              if (item->order > 0)
-                elm_table_unpack(wd->box, item->base);
+               elm_table_unpack(wd->box, item->base);
           }
         EINA_LIST_FOREACH(wd->items, l, item)
           {
              if (item->order > 0)
                {
                   if (item->order >= order)
-                     item->order += 1;
+                    item->order += 1;
                   if(!wd->vertical)
-                     elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1);
+                    elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1);
                   else
-                     elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1);
+                    elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1);
                   evas_object_show(item->base);
                }
           }
      }
    it->order = order;
    if(!wd->vertical)
-      elm_table_pack(wd->box, it->base, it->order - 1, 0, 1, 1);
+     elm_table_pack(wd->box, it->base, it->order - 1, 0, 1, 1);
    else
-      elm_table_pack(wd->box, it->base, 0, it->order - 1, 1, 1);
+     elm_table_pack(wd->box, it->base, 0, it->order - 1, 1, 1);
    evas_object_show(it->base);
 }
 
 static void
-item_delete_in_bar(Elm_Controlbar_Item * it) 
+item_delete_in_bar(Elm_Controlbar_Item * it)
 {
    const Eina_List *l;
    Elm_Controlbar_Item * item;
@@ -719,9 +719,9 @@ item_delete_in_bar(Elm_Controlbar_Item * it)
                   item->order--;
                   elm_table_unpack(wd->box, item->base);
                   if(!wd->vertical)
-                     elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1);
+                    elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1);
                   else
-                     elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1);
+                    elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1);
                }
           }
      }
@@ -755,7 +755,7 @@ item_visible_set(Elm_Controlbar_Item *it, Eina_Bool visible)
    _sizing_eval(it->obj);
 }
 
-static Eina_Bool 
+static Eina_Bool
 hide_selected_box(void *data)
 {
    Evas_Object *selected_box = (Evas_Object *)data;
@@ -774,7 +774,7 @@ item_color_set(Elm_Controlbar_Item *item, const char *color_part)
 
    color = (Evas_Object *) edje_object_part_object_get(_EDJ(item->base), color_part);
    if (color)
-      evas_object_color_get(color, &r, &g, &b, &a);
+     evas_object_color_get(color, &r, &g, &b, &a);
    evas_object_color_set(item->label, r, g, b, a);
    evas_object_color_set(item->icon, r, g, b, a);
 }
@@ -783,7 +783,7 @@ static void
 _end_selected_box(void *data, Evas_Object *obj)
 {
    Widget_Data * wd = (Widget_Data *)data;
-   
+
    if(item_exist_check(wd, wd->cur_item))
      {
         edje_object_signal_emit(_EDJ(wd->cur_item->base), wd->selected_signal, "elm");
@@ -807,7 +807,7 @@ move_selected_box(Widget_Data *wd, Elm_Controlbar_Item * fit, Elm_Controlbar_Ite
    Evas_Object *from, *to;
 
    if(fit->order <= 0 && wd->auto_align)
-      fit = wd->more_item;
+     fit = wd->more_item;
 
    from = (Evas_Object *)edje_object_part_object_get(_EDJ(fit->base), "bg_img");
    evas_object_geometry_get(from, &fx, &fy, &fw, &fh);
@@ -821,7 +821,7 @@ move_selected_box(Widget_Data *wd, Elm_Controlbar_Item * fit, Elm_Controlbar_Ite
         edje_object_signal_emit(_EDJ(wd->pre_item->base_item), "elm,state,shadow_hide", "elm");
      }
    if(item_exist_check(wd, wd->cur_item))
-      edje_object_signal_emit(_EDJ(wd->cur_item->base), "elm,state,unselected", "elm");
+     edje_object_signal_emit(_EDJ(wd->cur_item->base), "elm,state,unselected", "elm");
 
    wd->animating++;
    if (wd->ad)
@@ -832,11 +832,11 @@ move_selected_box(Widget_Data *wd, Elm_Controlbar_Item * fit, Elm_Controlbar_Ite
         wd->ad = NULL;
      }
    wd->ad = move_object_with_animation(wd->selected_box, fx, fy, fw, fh, tx, ty, tw, th,
-                              0.3, move_evas_object, _end_selected_box, wd);
+                                       0.3, move_evas_object, _end_selected_box, wd);
 }
 
-static void 
-selected_box(Elm_Controlbar_Item * it) 
+static void
+selected_box(Elm_Controlbar_Item * it)
 {
    if(!it) return;
    Widget_Data * wd = elm_widget_data_get(it->obj);
@@ -860,7 +860,7 @@ selected_box(Elm_Controlbar_Item * it)
         }
         it->selected = EINA_TRUE;
 
+
         if(fit != NULL && fit != it)
           {
              move_selected_box(wd, fit, it);
@@ -874,7 +874,7 @@ selected_box(Elm_Controlbar_Item * it)
         if(fit != it)
           {
              if(wd->more_item != it)
-                evas_object_smart_callback_call(it->obj, "view,change,before", it);
+               evas_object_smart_callback_call(it->obj, "view,change,before", it);
           }
 
         elm_layout_content_set(wd->view, "elm.swallow.view", it->view);
@@ -884,7 +884,7 @@ selected_box(Elm_Controlbar_Item * it)
    }else if(it->style == TOOLBAR){
         edje_object_signal_emit(_EDJ(it->base), "elm,state,text_unselected", "elm");
         if (it->func)
-           it->func(it->data, it->obj, it);
+          it->func(it->data, it->obj, it);
    }
 }
 
@@ -916,7 +916,7 @@ cancel_selected_box(Widget_Data *wd)
 }
 
 static void
-unpressed_box_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info) 
+unpressed_box_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
 {
    Widget_Data * wd = (Widget_Data *) data;
    Evas_Event_Mouse_Up * ev = event_info;
@@ -925,7 +925,7 @@ unpressed_box_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
    evas_object_event_callback_del(wd->event_box, EVAS_CALLBACK_MOUSE_UP, unpressed_box_cb);
 
    cancel_selected_box(wd);
-  
+
    if(item_exist_check(wd, wd->pre_item))
      {
         evas_object_geometry_get(wd->pre_item->base, &x, &y, &w, &h);
@@ -937,8 +937,8 @@ unpressed_box_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
    return;
 }
 
-static Eina_Bool 
-pressed_box(Elm_Controlbar_Item * it) 
+static Eina_Bool
+pressed_box(Elm_Controlbar_Item * it)
 {
    Widget_Data * wd = elm_widget_data_get(it->obj);
    int check = 0;
@@ -967,7 +967,7 @@ pressed_box(Elm_Controlbar_Item * it)
           }
      }
    if (!check)
-      return EINA_FALSE;
+     return EINA_FALSE;
 
    wd->pre_item = it;
 
@@ -1006,14 +1006,14 @@ create_item_icon(Evas_Object *obj, Elm_Controlbar_Item * it, char *part)
    evas_object_size_hint_min_set(icon, 40, 40);
    evas_object_size_hint_max_set(icon, 100, 100);
    evas_object_show(icon);
-   if(obj && part) 
-      elm_layout_content_set(obj, part, icon);
+   if(obj && part)
+     elm_layout_content_set(obj, part, icon);
 
    return icon;
 }
 
 static Evas_Object *
-create_item_layout(Evas_Object * parent, Elm_Controlbar_Item * it, Evas_Object **item, Evas_Object **label, Evas_Object **icon, Evas_Object **sicon) 
+create_item_layout(Evas_Object * parent, Elm_Controlbar_Item * it, Evas_Object **item, Evas_Object **label, Evas_Object **icon, Evas_Object **sicon)
 {
 
    Evas_Object * obj;
@@ -1059,7 +1059,7 @@ create_item_layout(Evas_Object * parent, Elm_Controlbar_Item * it, Evas_Object *
 }
 
 static void
-bar_item_down_cb(void *data, Evas * evas, Evas_Object * obj, void *event_info) 
+bar_item_down_cb(void *data, Evas * evas, Evas_Object * obj, void *event_info)
 {
    Widget_Data * wd = (Widget_Data *) data;
    const Eina_List *l;
@@ -1070,13 +1070,13 @@ bar_item_down_cb(void *data, Evas * evas, Evas_Object * obj, void *event_info)
       if (item->base == obj) break;
 
    if (item == NULL) return;
+
    pressed_box(item);
 }
 
 static Elm_Controlbar_Item *
 create_tab_item(Evas_Object * obj, const char *icon_path, const char *label,
-                Evas_Object * view) 
+                Evas_Object * view)
 {
    Elm_Controlbar_Item * it;
    Widget_Data * wd;
@@ -1111,7 +1111,7 @@ create_tab_item(Evas_Object * obj, const char *icon_path, const char *label,
 static Elm_Controlbar_Item *
 create_tool_item(Evas_Object * obj, const char *icon_path, const char *label,
                  void (*func) (void *data, Evas_Object * obj,
-                               void *event_info), void *data) 
+                               void *event_info), void *data)
 {
 
    Elm_Controlbar_Item * it;
@@ -1129,7 +1129,7 @@ create_tool_item(Evas_Object * obj, const char *icon_path, const char *label,
      }
    it = ELM_NEW(Elm_Controlbar_Item);
    if (!it)
-      return NULL;
+     return NULL;
    it->obj = obj;
    it->text = eina_stringshare_add(label);
    it->icon_path = eina_stringshare_add(icon_path);
@@ -1147,7 +1147,7 @@ create_tool_item(Evas_Object * obj, const char *icon_path, const char *label,
 }
 
 static Elm_Controlbar_Item *
-create_object_item(Evas_Object * obj, Evas_Object * obj_item, const int sel) 
+create_object_item(Evas_Object * obj, Evas_Object * obj_item, const int sel)
 {
    Elm_Controlbar_Item * it;
    Widget_Data * wd;
@@ -1164,7 +1164,7 @@ create_object_item(Evas_Object * obj, Evas_Object * obj_item, const int sel)
      }
    it = ELM_NEW(Elm_Controlbar_Item);
    if (!it)
-      return NULL;
+     return NULL;
    it->obj = obj;
    it->sel = sel;
    it->style = OBJECT;
@@ -1184,16 +1184,16 @@ repack_items(Widget_Data *wd)
           {
              elm_table_unpack(wd->box, item->base);
              if(!wd->vertical)
-                elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1);
+               elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1);
              else
-                elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1);
+               elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1);
           }
      }
 }
 
 static void
 set_items_position(Evas_Object * obj, Elm_Controlbar_Item * it,
-                   Elm_Controlbar_Item * mit, Eina_Bool bar) 
+                   Elm_Controlbar_Item * mit, Eina_Bool bar)
 {
    Widget_Data * wd;
    const Eina_List *l;
@@ -1237,15 +1237,15 @@ set_items_position(Evas_Object * obj, Elm_Controlbar_Item * it,
              }
           }
         if (item->style != OBJECT)
-           i++;
+          i++;
         if(item->order > 0) order += item->sel;
      }
    if (!check)
      {
         if(bar)
-           it->order = order;
+          it->order = order;
         else
-           it->order = 0;
+          it->order = 0;
      }
    wd->num++;
 
@@ -1260,8 +1260,8 @@ set_items_position(Evas_Object * obj, Elm_Controlbar_Item * it,
              elm_table_pack(wd->box, it->base, 0, it->order - 1, it->sel, 1);
           }
      }
-   else 
-      evas_object_hide(it->base);
+   else
+     evas_object_hide(it->base);
 }
 
 static void
@@ -1295,8 +1295,8 @@ list_clicked(void *data, Evas_Object *obj, void *event_info)
         elm_layout_content_set(wd->view, "elm.swallow.view", item->view);
      }
 
-   if(item->style == TOOLBAR && item->func) 
-      item->func(item->data, item->obj, item);
+   if(item->style == TOOLBAR && item->func)
+     item->func(item->data, item->obj, item);
 }
 
 static Evas_Object *
@@ -1315,12 +1315,12 @@ create_more_view(Widget_Data *wd)
         if(item->order <= 0)
           {
              icon = NULL;
-             if(item->icon_path) 
+             if(item->icon_path)
                {
-                  icon = create_item_icon(list, item, NULL); 
+                  icon = create_item_icon(list, item, NULL);
                   evas_object_color_set(icon, 0, 0, 0, 255);
                }
-             elm_list_item_append(list, item->text, icon, NULL, list_clicked, item); 
+             elm_list_item_append(list, item->text, icon, NULL, list_clicked, item);
           }
      }
 
@@ -1340,12 +1340,12 @@ static void _ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
       if(!strcmp(it->text, elm_ctxpopup_item_label_get((Elm_Ctxpopup_Item *) event_info))) break;
 
    if(it->func)
-      it->func(it->data, it->obj, it);
+     it->func(it->data, it->obj, it);
 
    if(item_exist_check(wd, it)) evas_object_smart_callback_call(it->obj, "clicked", it);
 
    evas_object_del(ctxpopup);
-   ctxpopup = NULL; 
+   ctxpopup = NULL;
 }
 
 static void _ctxpopup_hide_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1353,7 +1353,7 @@ static void _ctxpopup_hide_cb(void *data, Evas_Object *obj, void *event_info)
    Evas_Object *ctxpopup = obj;
 
    evas_object_del(ctxpopup);
-   ctxpopup = NULL; 
+   ctxpopup = NULL;
 }
 
 static void
@@ -1375,9 +1375,9 @@ create_more_func(void *data, Evas_Object *obj, void *event_info)
         if(item->order <= 0)
           {
              icon = NULL;
-             if(item->icon_path) 
+             if(item->icon_path)
                {
-                  icon = create_item_icon(ctxpopup, item, NULL); 
+                  icon = create_item_icon(ctxpopup, item, NULL);
                   evas_object_color_set(icon, 0, 0, 0, 255);
                }
              elm_ctxpopup_item_append(ctxpopup, item->text, icon, _ctxpopup_cb, wd);
@@ -1431,7 +1431,7 @@ create_more_item(Widget_Data *wd, int style)
  * @return The new object or NULL if it cannot be created
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Evas_Object * elm_controlbar_add(Evas_Object * parent)
 {
    if (parent == NULL) return NULL;
@@ -1478,7 +1478,7 @@ EAPI Evas_Object * elm_controlbar_add(Evas_Object * parent)
      }
    evas_object_show(wd->view);
 
-   /* load background edj */ 
+   /* load background edj */
    wd->edje = edje_object_add(evas);
    _elm_theme_object_set(obj, wd->edje, "controlbar", "base", "default");
    if (wd->edje == NULL)
@@ -1561,7 +1561,7 @@ EAPI Evas_Object * elm_controlbar_add(Evas_Object * parent)
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_append(Evas_Object * obj,
                                                           const char
                                                           *icon_path,
@@ -1590,7 +1590,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_append(Evas_Object * obj,
    if(wd->init_animation) evas_object_hide(it->base);
    wd->items = eina_list_append(wd->items, it);
    if(wd->more_item)
-      elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
+     elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
 
    check_background(wd);
    _sizing_eval(obj);
@@ -1607,7 +1607,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_append(Evas_Object * obj,
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_prepend(Evas_Object *
                                                            obj,
                                                            const char
@@ -1641,7 +1641,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_prepend(Evas_Object *
    }
    wd->items = eina_list_prepend(wd->items, it);
    if(wd->more_item)
-      elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
+     elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
 
    check_background(wd);
    _sizing_eval(obj);
@@ -1659,7 +1659,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_prepend(Evas_Object *
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item *
 elm_controlbar_tab_item_insert_before(Evas_Object * obj,
                                       Elm_Controlbar_Item * before,
@@ -1675,7 +1675,7 @@ elm_controlbar_tab_item_insert_before(Evas_Object * obj,
    if (!it) return NULL;
    wd = elm_widget_data_get(obj);
    if(check_bar_item_number(wd) >= 5 && wd->auto_align){
-        if(!wd->more_item) 
+        if(!wd->more_item)
           {
              lit = elm_controlbar_last_item_get(obj);
              item_visible_set(lit, EINA_FALSE);
@@ -1698,7 +1698,7 @@ elm_controlbar_tab_item_insert_before(Evas_Object * obj,
    }
    wd->items = eina_list_prepend_relative(wd->items, it, before);
    if(wd->more_item)
-      elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
+     elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
 
    check_background(wd);
    _sizing_eval(obj);
@@ -1716,7 +1716,7 @@ elm_controlbar_tab_item_insert_before(Evas_Object * obj,
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item *
 elm_controlbar_tab_item_insert_after(Evas_Object * obj,
                                      Elm_Controlbar_Item * after,
@@ -1734,7 +1734,7 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj,
    wd = elm_widget_data_get(obj);
    item = elm_controlbar_item_next(after);
    if(check_bar_item_number(wd) >= 5 && wd->auto_align){
-        if(!wd->more_item) 
+        if(!wd->more_item)
           {
              lit = elm_controlbar_last_item_get(obj);
              item_visible_set(lit, EINA_FALSE);
@@ -1756,7 +1756,7 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj,
    }
    wd->items = eina_list_append_relative(wd->items, it, after);
    if(wd->more_item)
-      elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
+     elm_controlbar_item_view_set(wd->more_item, create_more_view(wd));
 
    check_background(wd);
    _sizing_eval(obj);
@@ -1774,7 +1774,7 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj,
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_append(Evas_Object *
                                                            obj,
                                                            const char
@@ -1825,7 +1825,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_append(Evas_Object *
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_prepend(Evas_Object *
                                                             obj,
                                                             const char
@@ -1882,7 +1882,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_prepend(Evas_Object *
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item *
 elm_controlbar_tool_item_insert_before(Evas_Object * obj,
                                        Elm_Controlbar_Item * before,
@@ -1902,7 +1902,7 @@ elm_controlbar_tool_item_insert_before(Evas_Object * obj,
    if (!it) return NULL;
    wd = elm_widget_data_get(obj);
    if(check_bar_item_number(wd) >= 5 && wd->auto_align){
-        if(!wd->more_item) 
+        if(!wd->more_item)
           {
              lit = elm_controlbar_last_item_get(obj);
              item_visible_set(lit, EINA_FALSE);
@@ -1941,7 +1941,7 @@ elm_controlbar_tool_item_insert_before(Evas_Object * obj,
  * @return     The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item *
 elm_controlbar_tool_item_insert_after(Evas_Object * obj,
                                       Elm_Controlbar_Item * after,
@@ -1963,7 +1963,7 @@ elm_controlbar_tool_item_insert_after(Evas_Object * obj,
    wd = elm_widget_data_get(obj);
    item = elm_controlbar_item_next(after);
    if(check_bar_item_number(wd) >= 5 && wd->auto_align){
-        if(!wd->more_item) 
+        if(!wd->more_item)
           {
              lit = elm_controlbar_last_item_get(obj);
              item_visible_set(lit, EINA_FALSE);
@@ -1998,7 +1998,7 @@ elm_controlbar_tool_item_insert_after(Evas_Object * obj,
  * @return  The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_object_item_append(Evas_Object *
                                                              obj,
                                                              Evas_Object *
@@ -2026,7 +2026,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_object_item_append(Evas_Object *
  * @return  The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_object_item_prepend(Evas_Object *
                                                               obj,
                                                               Evas_Object *
@@ -2057,7 +2057,7 @@ EAPI Elm_Controlbar_Item * elm_controlbar_object_item_prepend(Evas_Object *
  * @return  The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item *
 elm_controlbar_object_item_insert_before(Evas_Object * obj,
                                          Elm_Controlbar_Item * before,
@@ -2086,7 +2086,7 @@ elm_controlbar_object_item_insert_before(Evas_Object * obj,
  * @return  The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item *
 elm_controlbar_object_item_insert_after(Evas_Object * obj,
                                         Elm_Controlbar_Item * after,
@@ -2113,9 +2113,9 @@ elm_controlbar_object_item_insert_after(Evas_Object * obj,
  * @param      it The item of controlbar
 
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_item_del(Elm_Controlbar_Item * it) 
+elm_controlbar_item_del(Elm_Controlbar_Item * it)
 {
    if (!it) return;
    Evas_Object * obj;
@@ -2125,7 +2125,7 @@ elm_controlbar_item_del(Elm_Controlbar_Item * it)
    Elm_Controlbar_Item * item;
    int check = 0;
 
-//   int i = 1;
+   //   int i = 1;
 
    int sel = 1;
 
@@ -2156,16 +2156,16 @@ elm_controlbar_item_del(Elm_Controlbar_Item * it)
                        elm_table_unpack(wd->box, item->base);
                        item->order -= sel;
                        if(!wd->vertical)
-                          elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1);
+                         elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1);
                        else
-                          elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1);
+                         elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1);
                     }
                }
              if (it == item)
-                check = 1;
+               check = 1;
           }
      }
-   
+
    // delete item in list
    _item_del(it);
    wd->items = eina_list_remove(wd->items, it);
@@ -2181,15 +2181,15 @@ elm_controlbar_item_del(Elm_Controlbar_Item * it)
  * @param      it The item of controlbar
 
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_item_select(Elm_Controlbar_Item * it) 
+elm_controlbar_item_select(Elm_Controlbar_Item * it)
 {
    if (!it) return;
    if (it->obj == NULL) return;
    Widget_Data * wd = elm_widget_data_get(it->obj);
    if (wd == NULL) return;
-   
+
    selected_box(it);
 }
 
@@ -2201,9 +2201,9 @@ elm_controlbar_item_select(Elm_Controlbar_Item * it)
  * @return     The icon object
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_item_icon_set(Elm_Controlbar_Item * it, const char *icon_path) 
+elm_controlbar_item_icon_set(Elm_Controlbar_Item * it, const char *icon_path)
 {
    if (!it) return;
    if(it->icon_path)
@@ -2236,12 +2236,12 @@ elm_controlbar_item_icon_set(Elm_Controlbar_Item * it, const char *icon_path)
         elm_label_wrap_mode_set(it->label, 0);
      }
    else if(!it->icon)
-      edje_object_signal_emit(_EDJ(it->base_item), "elm,state,default", "elm");
+     edje_object_signal_emit(_EDJ(it->base_item), "elm,state,default", "elm");
 
    if(it->disable)
-      item_color_set(it, "elm.item.disable.color");
+     item_color_set(it, "elm.item.disable.color");
    else
-      item_color_set(it, "elm.item.default.color");
+     item_color_set(it, "elm.item.default.color");
 }
 
 /**
@@ -2251,9 +2251,9 @@ elm_controlbar_item_icon_set(Elm_Controlbar_Item * it, const char *icon_path)
  * @return     The icon object
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Evas_Object *
-elm_controlbar_item_icon_get(Elm_Controlbar_Item * it) 
+elm_controlbar_item_icon_get(Elm_Controlbar_Item * it)
 {
    if (!it) return NULL;
    return it->icon;
@@ -2266,9 +2266,9 @@ elm_controlbar_item_icon_get(Elm_Controlbar_Item * it)
  * @param      label The label of item
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_item_label_set(Elm_Controlbar_Item * it, const char *label) 
+elm_controlbar_item_label_set(Elm_Controlbar_Item * it, const char *label)
 {
    if (!it) return;
    if(it->text)
@@ -2295,7 +2295,7 @@ elm_controlbar_item_label_set(Elm_Controlbar_Item * it, const char *label)
         elm_label_wrap_mode_set(it->label, 0);
      }
    else if(!it->label)
-      edje_object_signal_emit(_EDJ(it->base_item), "elm,state,default", "elm");
+     edje_object_signal_emit(_EDJ(it->base_item), "elm,state,default", "elm");
 }
 
 /**
@@ -2305,9 +2305,9 @@ elm_controlbar_item_label_set(Elm_Controlbar_Item * it, const char *label)
  * @return The label of item
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI const char *
-elm_controlbar_item_label_get(Elm_Controlbar_Item * it) 
+elm_controlbar_item_label_get(Elm_Controlbar_Item * it)
 {
    if (!it) return NULL;
    return it->text;
@@ -2320,9 +2320,9 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it)
  * @return             The item of controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_selected_item_get(Evas_Object *
-                                                            obj) 
+                                                            obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    const Eina_List *l;
@@ -2345,8 +2345,8 @@ EAPI Elm_Controlbar_Item * elm_controlbar_selected_item_get(Evas_Object *
  * @return             The item of controlbar
  *
  * @ingroup Controlbar
- */ 
-EAPI Elm_Controlbar_Item * elm_controlbar_first_item_get(Evas_Object * obj) 
+ */
+EAPI Elm_Controlbar_Item * elm_controlbar_first_item_get(Evas_Object * obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data * wd = elm_widget_data_get(obj);
@@ -2361,8 +2361,8 @@ EAPI Elm_Controlbar_Item * elm_controlbar_first_item_get(Evas_Object * obj)
  * @return             The item of controlbar
  *
  * @ingroup Controlbar
- */ 
-EAPI Elm_Controlbar_Item * elm_controlbar_last_item_get(Evas_Object * obj) 
+ */
+EAPI Elm_Controlbar_Item * elm_controlbar_last_item_get(Evas_Object * obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data * wd = elm_widget_data_get(obj);
@@ -2377,8 +2377,8 @@ EAPI Elm_Controlbar_Item * elm_controlbar_last_item_get(Evas_Object * obj)
  * @return     The list of the items
  *
  * @ingroup Controlbar
- */ 
-EAPI Eina_List * elm_controlbar_items_get(Evas_Object * obj) 
+ */
+EAPI Eina_List * elm_controlbar_items_get(Evas_Object * obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data * wd = elm_widget_data_get(obj);
@@ -2393,9 +2393,9 @@ EAPI Eina_List * elm_controlbar_items_get(Evas_Object * obj)
  * @return     The previous item of the parameter item
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_item_prev(Elm_Controlbar_Item *
-                                                    it) 
+                                                    it)
 {
    if (!it) return NULL;
    const Eina_List *l;
@@ -2423,9 +2423,9 @@ EAPI Elm_Controlbar_Item * elm_controlbar_item_prev(Elm_Controlbar_Item *
  * @return     The next item of the parameter item
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Elm_Controlbar_Item * elm_controlbar_item_next(Elm_Controlbar_Item *
-                                                    it) 
+                                                    it)
 {
    if (!it) return NULL;
    const Eina_List *l;
@@ -2453,9 +2453,9 @@ EAPI Elm_Controlbar_Item * elm_controlbar_item_next(Elm_Controlbar_Item *
  * @param      bar EINA_TRUE or EINA_FALSE
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_item_visible_set(Elm_Controlbar_Item * it, Eina_Bool visible) 
+elm_controlbar_item_visible_set(Elm_Controlbar_Item * it, Eina_Bool visible)
 {
    if (!it) return;
    if (it->obj == NULL) return;
@@ -2463,7 +2463,7 @@ elm_controlbar_item_visible_set(Elm_Controlbar_Item * it, Eina_Bool visible)
    if (!wd) return;
 
    if(!wd->auto_align)
-      item_visible_set(it, visible);
+     item_visible_set(it, visible);
 }
 
 /**
@@ -2473,9 +2473,9 @@ elm_controlbar_item_visible_set(Elm_Controlbar_Item * it, Eina_Bool visible)
  * @return     EINA_TRUE or EINA_FALSE
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Eina_Bool
-elm_controlbar_item_visible_get(Elm_Controlbar_Item * it) 
+elm_controlbar_item_visible_get(Elm_Controlbar_Item * it)
 {
    if (!it) return EINA_FALSE;
 
@@ -2494,9 +2494,9 @@ elm_controlbar_item_visible_get(Elm_Controlbar_Item * it)
  * @param      bar EINA_TRUE or EINA_FALSE
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_item_disable_set(Elm_Controlbar_Item * it, Eina_Bool disable) 
+elm_controlbar_item_disable_set(Elm_Controlbar_Item * it, Eina_Bool disable)
 {
    if (!it) return;
 
@@ -2521,9 +2521,9 @@ elm_controlbar_item_disable_set(Elm_Controlbar_Item * it, Eina_Bool disable)
  * @return     EINA_TRUE or EINA_FALSE
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Eina_Bool
-elm_controlbar_item_disable_get(Elm_Controlbar_Item * it) 
+elm_controlbar_item_disable_get(Elm_Controlbar_Item * it)
 {
    if (!it) return EINA_FALSE;
 
@@ -2537,13 +2537,13 @@ elm_controlbar_item_disable_get(Elm_Controlbar_Item * it)
  * @param      view The view for the item
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_item_view_set(Elm_Controlbar_Item *it, Evas_Object * view) 
+elm_controlbar_item_view_set(Elm_Controlbar_Item *it, Evas_Object * view)
 {
    if(!it) return;
 
-   it->view = view; 
+   it->view = view;
 }
 
 /**
@@ -2553,13 +2553,13 @@ elm_controlbar_item_view_set(Elm_Controlbar_Item *it, Evas_Object * view)
  * @return     The view for the item
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI Evas_Object *
-elm_controlbar_item_view_get(Elm_Controlbar_Item *it) 
+elm_controlbar_item_view_get(Elm_Controlbar_Item *it)
 {
    if(!it) return NULL;
 
-   return it->view; 
+   return it->view;
 }
 
 /**
@@ -2569,9 +2569,9 @@ elm_controlbar_item_view_get(Elm_Controlbar_Item *it)
  * @param      mode The mode of the controlbar
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
-elm_controlbar_mode_set(Evas_Object *obj, int mode) 
+elm_controlbar_mode_set(Evas_Object *obj, int mode)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -2587,22 +2587,22 @@ elm_controlbar_mode_set(Evas_Object *obj, int mode)
 
    switch(wd->mode)
      {
-      case ELM_CONTROLBAR_MODE_DEFAULT: 
+      case ELM_CONTROLBAR_MODE_DEFAULT:
          edje_object_signal_emit(wd->edje, "elm,state,default", "elm");
          break;
-      case ELM_CONTROLBAR_MODE_TRANSLUCENCE: 
+      case ELM_CONTROLBAR_MODE_TRANSLUCENCE:
          elm_controlbar_alpha_set(obj, 85);
          break;
       case ELM_CONTROLBAR_MODE_TRANSPARENCY:
          elm_controlbar_alpha_set(obj, 0);
          break;
-      case ELM_CONTROLBAR_MODE_LARGE: 
+      case ELM_CONTROLBAR_MODE_LARGE:
          edje_object_signal_emit(wd->edje, "elm,state,large", "elm");
          break;
-      case ELM_CONTROLBAR_MODE_SMALL: 
+      case ELM_CONTROLBAR_MODE_SMALL:
          edje_object_signal_emit(wd->edje, "elm,state,small", "elm");
          break;
-      case ELM_CONTROLBAR_MODE_LEFT: 
+      case ELM_CONTROLBAR_MODE_LEFT:
          wd->selected_box = wd->focused_box_left;
          wd->selected_signal = eina_stringshare_add("elm,state,selected_left");
          wd->pressed_signal = eina_stringshare_add("elm,state,pressed_left");
@@ -2636,7 +2636,7 @@ elm_controlbar_mode_set(Evas_Object *obj, int mode)
  * @param      alpha The alpha value of the controlbar (0-100)
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
 elm_controlbar_alpha_set(Evas_Object *obj, int alpha)
 {
@@ -2667,7 +2667,7 @@ elm_controlbar_alpha_set(Evas_Object *obj, int alpha)
  * @param      auto_align The dicision that the controlbar use the auto-align
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
 elm_controlbar_item_auto_align_set(Evas_Object *obj, Eina_Bool auto_align)
 {
@@ -2692,7 +2692,7 @@ elm_controlbar_item_auto_align_set(Evas_Object *obj, Eina_Bool auto_align)
              EINA_LIST_FOREACH(wd->items, l, item)
                {
                   if(elm_controlbar_item_visible_get(item))
-                     i++;
+                    i++;
                   if(i >= 5){
                        item_delete_in_bar(item);
                   }
@@ -2710,15 +2710,15 @@ elm_controlbar_item_auto_align_set(Evas_Object *obj, Eina_Bool auto_align)
           {
              // delete more item
              if(wd->more_item->view)
-                evas_object_del(wd->more_item->view);
+               evas_object_del(wd->more_item->view);
              wd->items = eina_list_remove(wd->items, wd->more_item);
              eina_stringshare_del(wd->more_item->text);
              if (wd->more_item->icon)
-                evas_object_del(wd->more_item->icon);
+               evas_object_del(wd->more_item->icon);
              if (wd->more_item->base)
-                evas_object_del(wd->more_item->base);
+               evas_object_del(wd->more_item->base);
              if (wd->more_item->base_item)
-                evas_object_del(wd->more_item->base_item);
+               evas_object_del(wd->more_item->base_item);
              free(wd->more_item);
              wd->more_item = NULL;
 
@@ -2727,7 +2727,7 @@ elm_controlbar_item_auto_align_set(Evas_Object *obj, Eina_Bool auto_align)
              EINA_LIST_FOREACH(wd->items, l, item)
                {
                   if(!elm_controlbar_item_visible_get(item))
-                     item_insert_in_bar(item, i);
+                    item_insert_in_bar(item, i);
                   i++;
                }
           }
@@ -2743,7 +2743,7 @@ elm_controlbar_item_auto_align_set(Evas_Object *obj, Eina_Bool auto_align)
  * @param      vertical The vertical mode of the controlbar (TRUE = vertical, FALSE = horizontal)
  *
  * @ingroup Controlbar
- */ 
+ */
 EAPI void
 elm_controlbar_vertical_set(Evas_Object *obj, Eina_Bool vertical)
 {
@@ -2775,14 +2775,14 @@ init_animation(void *data)
    wd->visible_items = eina_list_free(wd->visible_items);
    EINA_LIST_FOREACH(wd->items, l, item)
      {
-        if(item->order > 0) 
+        if(item->order > 0)
           {
              wd->visible_items = eina_list_append(wd->visible_items, item->base);
           }
      }
 
    if(wd->ani_func)
-      wd->ani_func(wd->ani_data, wd->object, wd->visible_items);
+     wd->ani_func(wd->ani_data, wd->object, wd->visible_items);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -2849,18 +2849,18 @@ elm_controlbar_item_animation_set(Evas_Object *obj, Eina_Bool auto_animation, Ei
    wd->selected_animation = selected_animation;
 }
 /*
-EAPI void
-elm_controlbar_view_animation_set(Evas_Object *obj, const char *hide, const char *show)
-{
+   EAPI void
+   elm_controlbar_view_animation_set(Evas_Object *obj, const char *hide, const char *show)
+   {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (wd == NULL)
-     {
-        fprintf(stderr, "Cannot get smart data\n");
-        return;
-     }
+   {
+   fprintf(stderr, "Cannot get smart data\n");
+   return;
+   }
 
    wd->view_hide = eina_stringshare_add(hide);
    wd->view_show = eina_stringshare_add(show);
-}
-*/
+   }
+ */
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 64f6706..7394292 100644 (file)
@@ -164,7 +164,7 @@ _eval_top(Evas_Object *obj)
    ittop = eina_list_last(wd->stack)->data;\r
    if (ittop != wd->top)\r
      {\r
-        Evas_Object *o, *o1, *o2;\r
+        Evas_Object *o1, *o2;\r
         const char *onshow, *onhide;\r
 \r
         if (wd->top)\r
@@ -944,7 +944,7 @@ elm_navigationbar_ex_item_style_get(Elm_Navigationbar_ex_Item* item)
 EAPI void\r
 elm_navigationbar_ex_item_promote(Elm_Navigationbar_ex_Item* item)\r
 {\r
-   if (!item) return NULL;\r
+   if (!item) return;\r
    _item_promote(item);\r
 }\r
 \r
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