Merge Conflict resolved.

[SegmentControl] Complete Refactoring of SegmentControl widget. Many APIs are deprecated.
New images are added for default theme. TestCases are modified and Added.
Deprecated APIs are marked with EINA_DEPRECATED.
Change-Id: I0f1ec8de4d1e285245d96d684b4c3cf27868b261

diff --git a/AUTHORS b/AUTHORS
index 2da2fd3..4f28642 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,4 +15,6 @@ Saumsung Electronics <tbd>
 Samsung SAIT <tbd>
 Brett Nash <nash@nash.id.au>
 Bruno Dilly <bdilly@profusion.mobi> 
-Rafael Fonseca <rfonseca@profusion.mobi> 
+Rafael Fonseca <rfonseca@profusion.mobi>
+Govindaraju SM  <govi.sm@samsung.com> <govism@gmail.com>
+Prince Kumar Dubey <prince.dubey@samsung.com>
\ No newline at end of file

diff --git a/TC/elm_ts/segmentcontrol/Makefile b/TC/elm_ts/segmentcontrol/Makefile
index 189ec19..82cab4c 100644 (file)
--- a/TC/elm_ts/segmentcontrol/Makefile
+++ b/TC/elm_ts/segmentcontrol/Makefile
@@ -1,19 +1,20 @@
 CC ?= gcc
 
 TARGETS = utc_UIFW_elm_segment_control_add_func \
-               utc_UIFW_elm_segment_control_item_add_func \
-               utc_UIFW_elm_segment_control_item_count_get_func \
-               utc_UIFW_elm_segment_control_item_del_at_func \
-               utc_UIFW_elm_segment_control_item_del_func \
-               utc_UIFW_elm_segment_control_item_get_at_func \
-               utc_UIFW_elm_segment_control_item_icon_get_func \
-               utc_UIFW_elm_segment_control_item_index_get_func \
-               utc_UIFW_elm_segment_control_item_insert_at_func \
-               utc_UIFW_elm_segment_control_item_label_get_func \
-               utc_UIFW_elm_segment_control_item_object_get_func \
-               utc_UIFW_elm_segment_control_item_selected_get_func \
-               utc_UIFW_elm_segment_control_item_selected_set_func \
-                utc_UIFW_elm_segment_control_item_label_object_set_func 
+      utc_UIFW_elm_segment_control_item_add_func \
+      utc_UIFW_elm_segment_control_item_count_get_func \
+      utc_UIFW_elm_segment_control_item_del_at_func \
+      utc_UIFW_elm_segment_control_item_del_func \
+      utc_UIFW_elm_segment_control_item_get_func \
+      utc_UIFW_elm_segment_control_item_icon_get_func \
+      utc_UIFW_elm_segment_control_item_icon_set_func \
+      utc_UIFW_elm_segment_control_item_index_get_func \
+      utc_UIFW_elm_segment_control_item_insert_at_func \
+      utc_UIFW_elm_segment_control_item_label_get_func \
+      utc_UIFW_elm_segment_control_item_label_set_func \
+      utc_UIFW_elm_segment_control_item_object_get_func \
+      utc_UIFW_elm_segment_control_item_selected_get_func \
+      utc_UIFW_elm_segment_control_item_selected_set_func 
 
 PKGS = elementary
 

diff --git a/TC/elm_ts/segmentcontrol/tslist b/TC/elm_ts/segmentcontrol/tslist
index 3129341..299ccbd 100644 (file)
--- a/TC/elm_ts/segmentcontrol/tslist
+++ b/TC/elm_ts/segmentcontrol/tslist
@@ -3,13 +3,14 @@
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_count_get_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_at_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_func
-/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_at_func
+/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_get_func
+/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_set_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_index_get_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_insert_at_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_get_func
+/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_set_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_object_get_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_get_func
 /elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_set_func
-/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_object_set_func
 

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_add_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_add_func.c
index f4c892c..ef66812 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_add_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_add_func.c
@@ -5,28 +5,27 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win;\r
 \r
 static void startup(void);\r
@@ -39,32 +38,32 @@ static void utc_UIFW_elm_segment_control_add_func_01(void);
 static void utc_UIFW_elm_segment_control_add_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_add_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_add_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_add_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_add_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -72,18 +71,20 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_add_func_01(void)\r
 {\r
-       Evas_Object *segment_control = NULL;\r
-\r
-\r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);\r
-\r
-       if (!segment_control) {\r
-               tet_infoline("elm_segment_control_add() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Evas_Object *segment_control = NULL;\r
+   Eina_Bool disabled = EINA_FALSE;\r
+\r
+   segment_control = elm_segment_control_add(main_win);\r
+   elm_object_disabled_set(segment_control, EINA_TRUE);\r
+   evas_object_show(segment_control);\r
+   disabled = elm_object_disabled_get(segment_control);\r
+\r
+   if (!segment_control && disabled) {\r
+   tet_infoline("elm_segment_control_add() failed in positive test case");\r
+   tet_result(TET_FAIL);\r
+   return;\r
+}\r
+tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -91,16 +92,15 @@ static void utc_UIFW_elm_segment_control_add_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_add_func_02(void)\r
 {\r
-       Evas_Object *segment_control = NULL;\r
-\r
+   Evas_Object *segment_control = NULL;\r
 \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);\r
+   segment_control = elm_segment_control_add(NULL);\r
+   evas_object_show(segment_control);\r
 \r
-       if (!segment_control) {\r
-               tet_infoline("elm_segment_control_add() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   if (segment_control) {\r
+      tet_infoline("elm_segment_control_add() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_add_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_add_func.c
index f399da2..9eda3fd 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_add_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_add_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_add_func_01(void);
 static void utc_UIFW_elm_segment_control_item_add_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_add_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_add_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_add_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_add_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,18 +77,18 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_add_func_01(void)\r
 {\r
-        Evas_Object *segment= NULL;\r
-        Elm_Segment_Item *item = NULL;\r
+   Evas_Object *segment= NULL;\r
+   Elm_Segment_Item *item = NULL;\r
 \r
-       segment = elm_segment_control_add(main_win);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       evas_object_show(segment);\r
-       if (!item) {\r
-               tet_infoline("elm_segment_control_item_add() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   segment = elm_segment_control_add(main_win);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   evas_object_show(segment);\r
+   if (!item) {\r
+      tet_infoline("elm_segment_control_item_add() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -98,15 +96,16 @@ static void utc_UIFW_elm_segment_control_item_add_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_add_func_02(void)\r
 {\r
-        Evas_Object *segment = NULL;\r
-        Elm_Segment_Item *item = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       item = elm_segment_control_item_add(NULL, NULL, "All", EINA_FALSE);\r
-       evas_object_show(segment);\r
-       if (item) {\r
-               tet_infoline("elm_segment_control_item_add() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Evas_Object *segment = NULL;\r
+   Elm_Segment_Item *item = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   item = elm_segment_control_item_add(NULL, NULL, "All");\r
+   evas_object_show(segment);\r
+   if (item) {\r
+      tet_infoline("elm_segment_control_item_add() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_count_get_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_count_get_func.c
index 684bfa9..1544377 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_count_get_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_count_get_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_count_get_func_01(void);
 static void utc_UIFW_elm_segment_control_item_count_get_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_count_get_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_count_get_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_count_get_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_count_get_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,19 +77,20 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_count_get_func_01(void)\r
 {\r
-       Evas_Object *segment = NULL;\r
-        Elm_Segment_Item *item = NULL;\r
-       int count;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       count = elm_segment_control_item_count_get(segment);\r
-       if (!count) {\r
-               tet_infoline("elm_segment_control_item_count_get() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Evas_Object *segment = NULL;\r
+   Elm_Segment_Item *item = NULL;\r
+   int count;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   count = elm_segment_control_item_count_get(segment);\r
+   if (!count) {\r
+      tet_infoline("elm_segment_control_item_count_get() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -99,18 +98,19 @@ static void utc_UIFW_elm_segment_control_item_count_get_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_count_get_func_02(void)\r
 {\r
-       Evas_Object *segment = NULL;\r
-        Elm_Segment_Item *item = NULL;\r
-       int count ;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       count = elm_segment_control_item_count_get(NULL);\r
+   Evas_Object *segment = NULL;\r
+   Elm_Segment_Item *item = NULL;\r
+   int count ;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   count = elm_segment_control_item_count_get(NULL);\r
 \r
-       if (count) {\r
-               tet_infoline("elm_segment_control_item_count_get() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   if (count) {\r
+      tet_infoline("elm_segment_control_item_count_get() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_at_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_at_func.c
index ad3af14..22e6a5c 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_at_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_at_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_del_at_func_01(void);
 static void utc_UIFW_elm_segment_control_item_del_at_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_del_at_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_del_at_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_del_at_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_del_at_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,20 +77,21 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_del_at_func_01(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;
-        Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_del_at(segment, 0, EINA_FALSE);
-        it = elm_segment_control_item_get_at(segment,0);\r
-       if (it) {\r
-               tet_infoline("elm_segment_control_item_del_at() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_del_at(segment, 0);
+   it = elm_segment_control_item_get(segment,0);\r
+   if (it) {\r
+      tet_infoline("elm_segment_control_item_del_at() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -100,18 +99,19 @@ static void utc_UIFW_elm_segment_control_item_del_at_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_del_at_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;
-        Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_del_at(NULL,0, EINA_FALSE);
-        it = elm_segment_control_item_get_at(segment,0);\r
-       if (!it) {\r
-               tet_infoline("elm_segment_control_item_del_at() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_del_at(NULL,0);
+   it = elm_segment_control_item_get(segment,0);\r
+   if (!it) {\r
+      tet_infoline("elm_segment_control_item_del_at() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_func.c
index eacc7bd..1f03482 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_del_func.c
@@ -5,28 +5,27 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+   } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
 \r
@@ -40,38 +39,38 @@ static void utc_UIFW_elm_segment_control_item_del_func_01(void);
 static void utc_UIFW_elm_segment_control_item_del_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_del_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_del_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_del_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_del_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,20 +78,21 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_del_func_01(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;
-        Elm_Segment_Item *it = NULL;\r
-        Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_del(segment, item, EINA_FALSE);
-        it = elm_segment_control_item_get_at(segment,0);\r
-       if (it) {\r
-               tet_infoline("elm_segment_control_item_del() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_del(item);
+   it = elm_segment_control_item_get(segment,0);\r
+   if (it) {\r
+      tet_infoline("elm_segment_control_item_del() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -100,18 +100,19 @@ static void utc_UIFW_elm_segment_control_item_del_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_del_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;
-        Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_del(segment, NULL, EINA_FALSE);
-        it = elm_segment_control_item_get_at(segment,0);\r
-       if (!it) {\r
-               tet_infoline("elm_segment_control_item_del() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_del(NULL);
+   it = elm_segment_control_item_get(segment,0);\r
+   if (!it) {\r
+      tet_infoline("elm_segment_control_item_del() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+   return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_at_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_at_func.c
deleted file mode 100644 (file)
index 0dd34da..0000000
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_at_func.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <tet_api.h>\r
-#include <Elementary.h>\r
-\r
-// Definitions\r
-// For checking the result of the positive test case.\r
-#define TET_CHECK_PASS(x1, y...) \\r
-{ \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
-}\r
-\r
-// For checking the result of the negative test case.\r
-#define TET_CHECK_FAIL(x1, y...) \\r
-{ \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
-}\r
-\r
-\r
-Evas_Object *main_win, *segment_control;\r
-\r
-\r
-static void startup(void);\r
-static void cleanup(void);\r
-\r
-void (*tet_startup)(void) = startup;\r
-void (*tet_cleanup)(void) = cleanup;\r
-\r
-static void utc_UIFW_elm_segment_control_item_get_at_func_01(void);\r
-static void utc_UIFW_elm_segment_control_item_get_at_func_02(void);\r
-\r
-enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
-};\r
-\r
-struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_get_at_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_get_at_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
-};\r
-\r
-static void startup(void)\r
-{\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
-}\r
-\r
-static void cleanup(void)\r
-{\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
-}\r
-\r
-/**\r
- * @brief Positive test case of elm_segment_control_item_get_at()\r
- */\r
-static void utc_UIFW_elm_segment_control_item_get_at_func_01(void)\r
-{\r
-    Elm_Segment_Item *item = NULL;\r
-       Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       it = elm_segment_control_item_get_at(segment,0);\r
-       if (!it) {\r
-               tet_infoline("elm_segment_control_item_get_at() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
-}\r
-\r
-/**\r
- * @brief Negative test case of ug_init elm_segment_control_item_get_at()\r
- */\r
-static void utc_UIFW_elm_segment_control_item_get_at_func_02(void)\r
-{\r
-    Elm_Segment_Item *item = NULL;\r
-       Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-        it = elm_segment_control_item_get_at(NULL, 0);\r
-       if (it) {\r
-               tet_infoline("elm_segment_control_item_get_at() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
-}\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_func.c
new file mode 100644 (file)
index 0000000..da53cda
--- /dev/null
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_get_func.c
@@ -0,0 +1,113 @@
+#include <tet_api.h>\r
+#include <Elementary.h>\r
+\r
+// Definitions\r
+// For checking the result of the positive test case.\r
+#define TET_CHECK_PASS(x1, y...) \\r
+{ \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
+}\r
+\r
+// For checking the result of the negative test case.\r
+#define TET_CHECK_FAIL(x1, y...) \\r
+{ \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
+}\r
+\r
+Evas_Object *main_win, *segment_control;\r
+\r
+static void startup(void);\r
+static void cleanup(void);\r
+\r
+void (*tet_startup)(void) = startup;\r
+void (*tet_cleanup)(void) = cleanup;\r
+\r
+static void utc_UIFW_elm_segment_control_item_get_func_01(void);\r
+static void utc_UIFW_elm_segment_control_item_get_func_02(void);\r
+\r
+enum {\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
+};\r
+\r
+struct tet_testlist tet_testlist[] = {\r
+   { utc_UIFW_elm_segment_control_item_get_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_get_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
+};\r
+\r
+static void startup(void)\r
+{\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
+}\r
+\r
+static void cleanup(void)\r
+{\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+}\r
+\r
+/**\r
+ * @brief Positive test case of elm_segment_control_item_get()\r
+ */\r
+static void utc_UIFW_elm_segment_control_item_get_func_01(void)\r
+{\r
+   Elm_Segment_Item *item = NULL;\r
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   it = elm_segment_control_item_get(segment,0);\r
+   if (!it) {\r
+      tet_infoline("elm_segment_control_item_get() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
+}\r
+\r
+/**\r
+ * @brief Negative test case of ug_init elm_segment_control_item_get()\r
+ */\r
+static void utc_UIFW_elm_segment_control_item_get_func_02(void)\r
+{\r
+   Elm_Segment_Item *item = NULL;\r
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   it = elm_segment_control_item_get(NULL, 0);\r
+   if (it) {\r
+      tet_infoline("elm_segment_control_item_get() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
+}\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_get_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_get_func.c
index 692b1ac..b633662 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_get_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_get_func.c
@@ -6,31 +6,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -41,38 +39,38 @@ static void utc_UIFW_elm_segment_control_item_icon_get_func_01(void);
 static void utc_UIFW_elm_segment_control_item_icon_get_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_icon_get_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_icon_get_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_icon_get_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_icon_get_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -80,24 +78,25 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_icon_get_func_01(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       Evas_Object *icon = NULL;\r
-       Evas_Object* ic = NULL;\r
-        char buf[PATH_MAX];\r
-        Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       ic = elm_icon_add(main_win);\r
-        snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PKG_DATA_DIR);\r
-        elm_icon_file_set(ic, buf, NULL);\r
-       item = elm_segment_control_item_add(segment, ic, "All",EINA_FALSE);\r
-       icon = elm_segment_control_item_icon_get(segment,0);\r
-       if (!icon) {\r
-       tet_infoline("elm_segment_control_item_icon_get() failed in positive test case");\r
-       tet_result(TET_FAIL);\r
-       return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *icon = NULL;\r
+   Evas_Object* ic = NULL;\r
+   char buf[PATH_MAX];\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   ic = elm_icon_add(main_win);\r
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PKG_DATA_DIR);\r
+   elm_icon_file_set(ic, buf, NULL);\r
+   item = elm_segment_control_item_add(segment, ic, "All");\r
+   icon = elm_segment_control_item_icon_get(segment,0);\r
+   if (!icon) {\r
+      tet_infoline("elm_segment_control_item_icon_get() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -105,22 +104,23 @@ static void utc_UIFW_elm_segment_control_item_icon_get_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_icon_get_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       Evas_Object *icon = NULL;\r
-       Evas_Object* ic = NULL;\r
-       char buf[PATH_MAX];\r
-        Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       ic = elm_icon_add(main_win);\r
-        snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PKG_DATA_DIR);\r
-        elm_icon_file_set(ic, buf, NULL);\r
-       item = elm_segment_control_item_add(segment, ic, "All",EINA_FALSE);\r
-       icon = elm_segment_control_item_icon_get(NULL,0);\r
-       if (icon) {\r
-               tet_infoline("elm_segment_control_item_icon_get() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *icon = NULL;\r
+   Evas_Object* ic = NULL;\r
+   char buf[PATH_MAX];\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   ic = elm_icon_add(main_win);\r
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PKG_DATA_DIR);\r
+   elm_icon_file_set(ic, buf, NULL);\r
+   item = elm_segment_control_item_add(segment, ic, "All");\r
+   icon = elm_segment_control_item_icon_get(NULL,0);\r
+   if (icon) {\r
+      tet_infoline("elm_segment_control_item_icon_get() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_set_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_set_func.c
new file mode 100644 (file)
index 0000000..817d58e
--- /dev/null
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_icon_set_func.c
@@ -0,0 +1,132 @@
+#include <tet_api.h>\r
+#include <Elementary.h>
+#define PKG_DATA_DIR "/usr/share/elementary"\r
+\r
+// Definitions\r
+// For checking the result of the positive test case.\r
+#define TET_CHECK_PASS(x1, y...) \\r
+{ \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
+}\r
+\r
+// For checking the result of the negative test case.\r
+#define TET_CHECK_FAIL(x1, y...) \\r
+{ \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
+}\r
+\r
+Evas_Object *main_win, *segment_control;\r
+\r
+static void startup(void);\r
+static void cleanup(void);\r
+\r
+void (*tet_startup)(void) = startup;\r
+void (*tet_cleanup)(void) = cleanup;\r
+\r
+static void utc_UIFW_elm_segment_control_item_icon_set_func_01(void);\r
+static void utc_UIFW_elm_segment_control_item_icon_set_func_02(void);\r
+\r
+enum {\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
+};\r
+\r
+struct tet_testlist tet_testlist[] = {\r
+   { utc_UIFW_elm_segment_control_item_icon_set_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_icon_set_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
+};\r
+\r
+static void startup(void)\r
+{\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
+}\r
+\r
+static void cleanup(void)\r
+{\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+}\r
+\r
+/**\r
+ * @brief Positive test case of elm_segment_control_item_icon_set()\r
+ */\r
+static void utc_UIFW_elm_segment_control_item_icon_set_func_01(void)\r
+{\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *icon = NULL;\r
+   Evas_Object* ic = NULL;\r
+   char buf[PATH_MAX];\r
+   Evas_Object *segment = NULL;\r
+   int index;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   ic = elm_icon_add(main_win);\r
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PKG_DATA_DIR);\r
+   elm_icon_file_set(ic, buf, NULL);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_icon_set(item, ic);\r
+   index = elm_segment_control_item_index_get(item);\r
+   icon = elm_segment_control_item_icon_get(segment,index);\r
+   if (!icon) {\r
+      tet_infoline("elm_segment_control_item_icon_set() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
+}\r
+\r
+/**\r
+ * @brief Negative test case of ug_init elm_segment_control_item_icon_set()\r
+ */\r
+static void utc_UIFW_elm_segment_control_item_icon_set_func_02(void)\r
+{\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *icon = NULL;\r
+   Evas_Object* ic = NULL;\r
+   char buf[PATH_MAX];\r
+   Evas_Object *segment = NULL;\r
+   int index;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   ic = elm_icon_add(main_win);\r
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PKG_DATA_DIR);\r
+   elm_icon_file_set(ic, buf, NULL);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_icon_set(item, ic);\r
+   index = elm_segment_control_item_index_get(item);\r
+   icon = elm_segment_control_item_icon_get(NULL, index);\r
+   if (icon) {\r
+      tet_infoline("elm_segment_control_item_icon_set() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
+}\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_index_get_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_index_get_func.c
index c099830..a27218d 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_index_get_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_index_get_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_index_get_func_01(void);
 static void utc_UIFW_elm_segment_control_item_index_get_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_index_get_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_index_get_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_index_get_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_index_get_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,18 +77,18 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_index_get_func_01(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       int index = -1;\r
-        Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       index = elm_segment_control_item_index_get(item);\r
-       if (index!=0) {\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   int index = -1;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   index = elm_segment_control_item_index_get(item);\r
+   if (index!=0) {\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -98,17 +96,17 @@ static void utc_UIFW_elm_segment_control_item_index_get_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_index_get_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       int index =-1;\r
-        Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All",EINA_FALSE);\r
-       index = elm_segment_control_item_index_get(NULL);\r
-       if (index!=-1) {\r
-               tet_infoline("elm_segment_control_item_index_get() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   int index =-1;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   index = elm_segment_control_item_index_get(NULL);\r
+   if (index!=-1) {\r
+      tet_infoline("elm_segment_control_item_index_get() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_insert_at_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_insert_at_func.c
index 814bb56..25a8b0c 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_insert_at_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_insert_at_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_insert_at_func_01(void);
 static void utc_UIFW_elm_segment_control_item_insert_at_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_insert_at_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_insert_at_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_insert_at_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_insert_at_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,17 +77,17 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_insert_at_func_01(void)\r
 {\r
-    Elm_Segment_Item *item = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_insert_at(segment, NULL, "All", 1 ,EINA_FALSE);\r
-       if (!item) {\r
-               tet_infoline("elm_segment_control_item_insert_at() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_insert_at(segment, NULL, "All", 0);\r
+   if (!item) {\r
+      tet_infoline("elm_segment_control_item_insert_at() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -97,15 +95,15 @@ static void utc_UIFW_elm_segment_control_item_insert_at_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_insert_at_func_02(void)\r
 {\r
-    Elm_Segment_Item *item = NULL;\r
-    Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_insert_at(NULL, NULL, "All", 1 ,EINA_FALSE);\r
-       if (item) {\r
-               tet_infoline("elm_segment_control_item_insert_at() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_insert_at(NULL, NULL, "All", 1);\r
+   if (item) {\r
+      tet_infoline("elm_segment_control_item_insert_at() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_get_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_get_func.c
index 1ff447a..a7a422a 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_get_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_get_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_label_get_func_01(void);
 static void utc_UIFW_elm_segment_control_item_label_get_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_label_get_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_label_get_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_label_get_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_label_get_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,19 +77,20 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_label_get_func_01(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       const char *label = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All",EINA_FALSE);\r
-       label = elm_segment_control_item_label_get(segment,0);\r
-       if (!(strcmp(label,"All"))) {\r
-           tet_result(TET_PASS);\r
-               return;\r
-       }\r
-       tet_infoline("elm_segment_control_item_label_get() failed in positive test case");\r
-       tet_result(TET_FAIL);\r
+   Elm_Segment_Item *item = NULL;\r
+   const char *label = NULL;\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   label = elm_segment_control_item_label_get(segment,0);\r
+   if (!(strcmp(label,"All"))) {\r
+      tet_result(TET_PASS);\r
+      return;\r
+   }\r
+   tet_infoline("elm_segment_control_item_label_get() failed in positive test case");\r
+   tet_result(TET_FAIL);\r
 }\r
 \r
 /**\r
@@ -99,17 +98,18 @@ static void utc_UIFW_elm_segment_control_item_label_get_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_label_get_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       const char *label = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All",EINA_FALSE);\r
-       label = elm_segment_control_item_label_get(NULL,0);\r
-       if (label) {\r
-               tet_infoline("elm_segment_control_item_label_get() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   const char *label = NULL;\r
+   Evas_Object *segment = NULL;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   label = elm_segment_control_item_label_get(NULL,0);\r
+   if (label) {\r
+      tet_infoline("elm_segment_control_item_label_get() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_object_set_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_object_set_func.c
deleted file mode 100644 (file)
index 2f71eac..0000000
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_object_set_func.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#include <tet_api.h>\r
-#include <Elementary.h>\r
-\r
-// Definitions\r
-// For checking the result of the positive test case.\r
-#define TET_CHECK_PASS(x1, y...) \\r
-{ \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
-}\r
-\r
-// For checking the result of the negative test case.\r
-#define TET_CHECK_FAIL(x1, y...) \\r
-{ \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
-}\r
-\r
-\r
-Evas_Object *main_win, *segment_control;\r
-\r
-static void startup(void);\r
-static void cleanup(void);\r
-\r
-void (*tet_startup)(void) = startup;\r
-void (*tet_cleanup)(void) = cleanup;\r
-\r
-static void utc_UIFW_elm_segment_control_item_label_object_set_func_01(void);\r
-static void utc_UIFW_elm_segment_control_item_label_object_set_func_02(void);\r
-\r
-enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
-};\r
-\r
-struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_label_object_set_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_label_object_set_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
-};\r
-\r
-static void startup(void)\r
-{\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
-}\r
-\r
-static void cleanup(void)\r
-{\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
-}\r
-\r
-/**\r
- * @brief Positive test case of elm_segment_control_item_label_object_set()\r
- */\r
-static void utc_UIFW_elm_segment_control_item_label_object_set_func_01(void)\r
-{\r
-        Elm_Segment_Item *item = NULL;\r
-       const char *label = NULL;
-       char *ch = "All";\r
-       item = elm_segment_control_item_add(segment_control, NULL, NULL,EINA_FALSE);
-        elm_segment_control_item_label_object_set(item, ch);\r
-       label = elm_segment_control_item_label_get(segment_control,0);\r
-       if (!(strcmp(label,"All"))) {\r
-           tet_result(TET_PASS);\r
-               return;\r
-       }\r
-       tet_infoline("elm_segment_control_item_label_set() failed in positive test case");\r
-       tet_result(TET_FAIL);\r
-}\r
-\r
-/**\r
- * @brief Negative test case of ug_init elm_segment_control_item_label_object_set()\r
- */\r
-static void utc_UIFW_elm_segment_control_item_label_object_set_func_02(void)\r
-{\r
-        Elm_Segment_Item *item = NULL;\r
-       Evas_Object *label = NULL;\r
-       item = elm_segment_control_item_add(segment_control, NULL, NULL,EINA_FALSE);
-        label = elm_segment_control_item_label_object_set(item, NULL);\r
-       elm_segment_control_item_label_get(segment_control,0);\r
-       if (label) {\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
-}\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_set_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_set_func.c
new file mode 100644 (file)
index 0000000..90dc145
--- /dev/null
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_label_set_func.c
@@ -0,0 +1,121 @@
+#include <tet_api.h>\r
+#include <Elementary.h>\r
+\r
+// Definitions\r
+// For checking the result of the positive test case.\r
+#define TET_CHECK_PASS(x1, y...) \\r
+{ \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
+}\r
+\r
+// For checking the result of the negative test case.\r
+#define TET_CHECK_FAIL(x1, y...) \\r
+{ \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
+}\r
+\r
+Evas_Object *main_win, *segment_control;\r
+\r
+static void startup(void);\r
+static void cleanup(void);\r
+\r
+void (*tet_startup)(void) = startup;\r
+void (*tet_cleanup)(void) = cleanup;\r
+\r
+static void utc_UIFW_elm_segment_control_item_label_set_func_01(void);\r
+static void utc_UIFW_elm_segment_control_item_label_set_func_02(void);\r
+\r
+enum {\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
+};\r
+\r
+struct tet_testlist tet_testlist[] = {\r
+   { utc_UIFW_elm_segment_control_item_label_set_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_label_set_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
+};\r
+\r
+static void startup(void)\r
+{\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
+}\r
+\r
+static void cleanup(void)\r
+{\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+}\r
+\r
+/**\r
+ * @brief Positive test case of elm_segment_control_item_label_set()\r
+ */\r
+static void utc_UIFW_elm_segment_control_item_label_set_func_01(void)\r
+{\r
+   Elm_Segment_Item *item = NULL;\r
+   const char *label = NULL;\r
+   Evas_Object *segment = NULL;\r
+   int index;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "test");\r
+   elm_segment_control_item_label_set(item, "All");\r
+   index = elm_segment_control_item_index_get(item);\r
+   label = elm_segment_control_item_label_get(segment, index);\r
+   if (!(strcmp(label,"All"))) {\r
+      tet_result(TET_PASS);\r
+      return;\r
+   }\r
+   tet_infoline("elm_segment_control_item_label_set() failed in positive test case");\r
+   tet_result(TET_FAIL);\r
+}\r
+\r
+/**\r
+ * @brief Negative test case of ug_init elm_segment_control_item_label_set()\r
+ */\r
+static void utc_UIFW_elm_segment_control_item_label_set_func_02(void)\r
+{\r
+   Elm_Segment_Item *item = NULL;\r
+   const char *label = NULL;\r
+   Evas_Object *segment = NULL;\r
+   int index;\r
+\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_label_set(item, "All");\r
+   index = elm_segment_control_item_index_get(item);\r
+   label = elm_segment_control_item_label_get(NULL, index);\r
+   if (label) {\r
+      tet_infoline("elm_segment_control_item_label_set() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
+}\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_object_get_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_object_get_func.c
index 69cc7b5..22a6517 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_object_get_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_object_get_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_object_get_func_01(void);
 static void utc_UIFW_elm_segment_control_item_object_get_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_object_get_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_object_get_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_object_get_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_object_get_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,19 +77,19 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_object_get_func_01(void)\r
 {\r
-    Elm_Segment_Item *item = NULL;\r
-       Evas_Object *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       it = elm_segment_control_item_object_get(item);\r
-       if (!it) {\r
-               tet_infoline("elm_segment_control_item_object_get() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   it = elm_segment_control_item_object_get(item);\r
+   if (!it) {\r
+      tet_infoline("elm_segment_control_item_object_get() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -99,17 +97,17 @@ static void utc_UIFW_elm_segment_control_item_object_get_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_object_get_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       Evas_Object *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-        it = elm_segment_control_item_object_get(NULL);\r
-       if (it) {\r
-               tet_infoline("elm_segment_control_item_object_get() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Evas_Object *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   it = elm_segment_control_item_object_get(NULL);\r
+   if (it) {\r
+      tet_infoline("elm_segment_control_item_object_get() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_get_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_get_func.c
index 21f8250..96372dd 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_get_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_get_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_selected_get_func_01(void);
 static void utc_UIFW_elm_segment_control_item_selected_get_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_selected_get_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_selected_get_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_selected_get_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_selected_get_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,20 +77,20 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_selected_get_func_01(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_selected_set( item, 1);\r
-       it = elm_segment_control_item_selected_get(segment);\r
-       if (!it) {\r
-               tet_infoline("elm_segment_control_item_selected_get() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_selected_set( item, EINA_TRUE);\r
+   it = elm_segment_control_item_selected_get(segment);\r
+   if (!it) {\r
+      tet_infoline("elm_segment_control_item_selected_get() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -100,18 +98,18 @@ static void utc_UIFW_elm_segment_control_item_selected_get_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_selected_get_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_selected_set( item, 1);\r
-        it = elm_segment_control_item_selected_get(NULL);\r
-       if (it) {\r
-               tet_infoline("elm_segment_control_item_selected_get() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_selected_set( item, EINA_TRUE);\r
+   it = elm_segment_control_item_selected_get(NULL);\r
+   if (it) {\r
+      tet_infoline("elm_segment_control_item_selected_get() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_set_func.c b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_set_func.c
index e2c598e..5bb6c0a 100644 (file)
--- a/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_set_func.c
+++ b/TC/elm_ts/segmentcontrol/utc_UIFW_elm_segment_control_item_selected_set_func.c
@@ -5,31 +5,29 @@
 // For checking the result of the positive test case.\r
 #define TET_CHECK_PASS(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err == (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err == (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
 // For checking the result of the negative test case.\r
 #define TET_CHECK_FAIL(x1, y...) \\r
 { \\r
-       Evas_Object *err = y; \\r
-       if (err != (x1)) \\r
-               { \\r
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
-                       tet_result(TET_FAIL); \\r
-                       return; \\r
-               } \\r
+   Evas_Object *err = y; \\r
+   if (err != (x1)) \\r
+     { \\r
+        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \\r
+        tet_result(TET_FAIL); \\r
+        return; \\r
+     } \\r
 }\r
 \r
-\r
 Evas_Object *main_win, *segment_control;\r
 \r
-\r
 static void startup(void);\r
 static void cleanup(void);\r
 \r
@@ -40,38 +38,38 @@ static void utc_UIFW_elm_segment_control_item_selected_set_func_01(void);
 static void utc_UIFW_elm_segment_control_item_selected_set_func_02(void);\r
 \r
 enum {\r
-       POSITIVE_TC_IDX = 0x01,\r
-       NEGATIVE_TC_IDX,\r
+   POSITIVE_TC_IDX = 0x01,\r
+   NEGATIVE_TC_IDX,\r
 };\r
 \r
 struct tet_testlist tet_testlist[] = {\r
-       { utc_UIFW_elm_segment_control_item_selected_set_func_01, POSITIVE_TC_IDX },\r
-       { utc_UIFW_elm_segment_control_item_selected_set_func_02, NEGATIVE_TC_IDX },\r
-       { NULL, 0 }\r
+   { utc_UIFW_elm_segment_control_item_selected_set_func_01, POSITIVE_TC_IDX },\r
+   { utc_UIFW_elm_segment_control_item_selected_set_func_02, NEGATIVE_TC_IDX },\r
+   { NULL, 0 }\r
 };\r
 \r
 static void startup(void)\r
 {\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
-       elm_init(0, NULL);\r
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
-       evas_object_show(main_win);     \r
-       segment_control = elm_segment_control_add(main_win);\r
-       evas_object_show(segment_control);      \r
+   tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");\r
+   elm_init(0, NULL);\r
+   main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);\r
+   evas_object_show(main_win);\r
+   segment_control = elm_segment_control_add(main_win);\r
+   evas_object_show(segment_control);\r
 }\r
 \r
 static void cleanup(void)\r
 {\r
-       if ( NULL != main_win ) {\r
-               evas_object_del(main_win);\r
-               main_win = NULL;\r
-       }\r
-       if ( NULL != segment_control ) {\r
-               evas_object_del(segment_control);\r
-               segment_control = NULL;\r
-       }\r
-       elm_shutdown();\r
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
+   if ( NULL != main_win ) {\r
+      evas_object_del(main_win);\r
+      main_win = NULL;\r
+   }\r
+   if ( NULL != segment_control ) {\r
+      evas_object_del(segment_control);\r
+      segment_control = NULL;\r
+   }\r
+   elm_shutdown();\r
+   tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");\r
 }\r
 \r
 /**\r
@@ -79,20 +77,20 @@ static void cleanup(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_selected_set_func_01(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_selected_set( item, 1);\r
-       it = elm_segment_control_item_selected_get(segment);\r
-       if (!it) {\r
-               tet_infoline("elm_segment_control_item_selected_set() failed in positive test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_selected_set( item, EINA_TRUE);\r
+   it = elm_segment_control_item_selected_get(segment);\r
+   if (!it) {\r
+      tet_infoline("elm_segment_control_item_selected_set() failed in positive test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r
 \r
 /**\r
@@ -100,18 +98,18 @@ static void utc_UIFW_elm_segment_control_item_selected_set_func_01(void)
  */\r
 static void utc_UIFW_elm_segment_control_item_selected_set_func_02(void)\r
 {\r
-        Elm_Segment_Item *item = NULL;\r
-       Elm_Segment_Item *it = NULL;\r
-       Evas_Object *segment = NULL;\r
-       segment = elm_segment_control_add(main_win);\r
-       evas_object_show(segment);\r
-       item = elm_segment_control_item_add(segment, NULL, "All", EINA_FALSE);\r
-       elm_segment_control_item_selected_set( NULL, 1);\r
-        it = elm_segment_control_item_selected_get(segment);\r
-       if (it) {\r
-               tet_infoline("elm_segment_control_item_selected_set() failed in negative test case");\r
-               tet_result(TET_FAIL);\r
-               return;\r
-       }\r
-       tet_result(TET_PASS);\r
+   Elm_Segment_Item *item = NULL;\r
+   Elm_Segment_Item *it = NULL;\r
+   Evas_Object *segment = NULL;\r
+   segment = elm_segment_control_add(main_win);\r
+   evas_object_show(segment);\r
+   item = elm_segment_control_item_add(segment, NULL, "All");\r
+   elm_segment_control_item_selected_set( NULL, EINA_TRUE);\r
+   it = elm_segment_control_item_selected_get(segment);\r
+   if (it) {\r
+      tet_infoline("elm_segment_control_item_selected_set() failed in negative test case");\r
+      tet_result(TET_FAIL);\r
+      return;\r
+   }\r
+   tet_result(TET_PASS);\r
 }\r

diff --git a/data/objects/test.edc b/data/objects/test.edc
index 44b532c..35763e9 100644 (file)
--- a/data/objects/test.edc
+++ b/data/objects/test.edc
@@ -470,6 +470,136 @@ collections {
          }
       }
    }
+   group { name: "segment_test";
+      parts{
+         part {
+            name: "bg";
+            type: RECT;
+            scale: 1; //allow scaling
+            description {
+            state: "default" 0.0;
+            color:  0 0 0 0;
+            }
+         }
+         part { name: "top_padding";
+            type: RECT;
+            scale: 1; //allow scaling
+            description {
+               state: "default" 0.0;
+               min : 250 30; //minimum size for gap filler
+               fixed: 0 1;
+               rel1 { relative: 0 0; }
+               rel2 { relative: 1 0; }
+               color:  0 0 0 0;
+               align: 0 0;
+            }
+         }
+         part { name: "segment";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 360 50;
+               max: 360 50;
+               rel1 { relative: 0 1.0; to_y: "top_padding"; }
+               align: 0.5 0;
+            }
+         }
+         part { name: "btn1_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min : 250 30;
+               max : 250 30;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1 { relative: 0 1.0; to_y: "segment"; }
+               rel2 { relative: 1 1.0; to_y: "segment"; }
+               color: 0 255 0 0;
+            }
+         }
+         part { name: "add";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.5 0;
+               min: 250 50;
+               max: 250 50;
+               rel1 { relative: 0 1.0; to_y: "btn1_bottom_padding"; }
+               align: 0.5 0;
+            }
+         }
+         part { name: "btn2_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min : 250 50;
+               max : 250 50;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1 { relative: 0 1.0; to_y: "add"; }
+               rel2 { relative: 1 1.0; to_y: "add"; }
+              color: 0 0 0 0;
+           }
+         }
+         part { name: "del";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 250 50;
+               max: 250 50;
+               align: 0.5 0;
+               rel1 { relative: 0 1.0; to_y: "btn2_bottom_padding"; }
+               align: 0.5 0;
+            }
+         }
+         part { name: "btn3_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min : 250 50;
+               max : 250 50;
+               fixed: 1 1;
+               align: 0.5 0;
+               rel1 { relative: 0 1.0; to_y: "del"; }
+               rel2 { relative: 1 1.0; to_y: "del"; }
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "insert";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               fixed: 1 1;
+               min: 250 50;
+               max: 250 50;
+               state: "default" 0.0;
+               rel1 { relative: 0 1.0; to_y: "btn3_bottom_padding"; }
+               align: 0.5 0;
+            }
+         }
+         part { name: "btn_bottom_padding";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min : 0 30;
+               rel1 { relative: 0 1.0; to_y: "insert"; }
+               rel2 { relative: 1 1.0;}
+               color: 0 0 0 0;
+               align: 0.5 1;
+            }
+         }
+      }
+   }
    group { name: "bg_overlay";
       images {
         image: "clo.png" LOSSY 60;

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 8799f6c..1a1ae6c 100644 (file)
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -9,7 +9,727 @@
 externals.external: "elm";
 
 collections {
+///////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/segment_control/base/default";
+      parts {
+         part { name: "bg";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               min: 100 40;
+            }
+         }
+      }
+   }
+   group { name: "elm/segment_control/item/default";
+      data.item: "label.wrap.part" "label.bg";
+      images {
+         image: "seg_single_pressed.png" COMP;
+         image: "seg_single_selected.png" COMP;
+         image: "seg_single_normal.png" COMP;
+
+         image: "seg_left_pressed.png" COMP;
+         image: "seg_left_selected.png" COMP;
+         image: "seg_left_normal.png" COMP;
+
+         image: "seg_middle_pressed.png" COMP;
+         image: "seg_middle_selected.png" COMP;
+         image: "seg_middle_normal.png" COMP;
+
+         image: "seg_right_pressed.png" COMP;
+         image: "seg_right_selected.png" COMP;
+         image: "seg_right_normal.png" COMP;
+      }
+      parts {
+         part { name: "segment";
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 1 1;
+               visible: 0;
+               image {
+                  normal: "seg_single_normal.png";
+                  border: 7 7 7 7;
+                  border_scale: 1;
+                  middle: 1;
+               }
+            }
+            description { state: "default_single" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_single_normal.png";
+                  border: 7 7 7 7;
+               }
+            }
+            description { state: "default_left" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+               normal: "seg_left_normal.png";
+                  border:  6 1 7 7;
+               }
+            }
+            description { state: "default_right" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_right_normal.png";
+                  border: 1 6 7 7;
+               }
+            }
+            description { state: "default_middle" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_middle_normal.png";
+                  border: 2 2 2 2;
+               }
+            }
+            description { state: "pressed_single" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_single_pressed.png";
+                  border: 7 7 7 7;
+               }
+            }
+            description { state: "pressed_left" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_left_pressed.png";
+                  border:  6 1 7 7;
+               }
+            }
+            description { state: "pressed_right" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_right_pressed.png";
+                  border: 1 6 7 7;
+               }
+            }  
+            description { state: "pressed_middle" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_middle_pressed.png";
+                  border: 1 1 2 2;
+               }
+            }
+            description { state: "selected_single" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_single_selected.png";
+                  border: 7 7 7 7;
+               }
+            }
+            description { state: "selected_left" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_left_selected.png";
+                  border:  6 3 7 7;
+               }
+            }
+            description { state: "selected_right" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_right_selected.png";
+                  border: 3 6 7 7;
+               }
+            }
+            description { state: "selected_middle" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_middle_selected.png";
+                  border: 3 3 3 3;
+               }
+            }
+         }
+         part { name: "padding_left";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 1.0;
+               min: 2 2;
+               max: 2 2;
+               fixed: 1 0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "padding_right";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 1.0 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 1.0;
+               min: 2 2;
+               max: 2 2;
+               fixed: 1 0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "padding_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+               min: 2 2;
+               max: 2 2;
+               fixed: 0 1;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "padding_bottom";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+               min: 2 2;
+               max: 2 2;
+               fixed: 0 1;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "icon.bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 1;
+               fixed: 1 0;
+               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 {relative: 1.0 1.0; to: "elm.swallow.icon"; }
+               align: 0.0 0.5;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "padding_icon_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 0.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "icon.bg"; }
+               rel2 { relative: 1.0 1.0; to: "icon.bg"; }
+               fixed: 1 0;
+               min: 0 0;
+               color: 0 0 0 0;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               align: 0.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "icon.bg"; }
+               rel2 { relative: 1.0 1.0; to: "icon.bg"; }
+               fixed: 1 0;
+               min: 2 0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 {relative: 0.0 0.0; to_y: "padding_bottom"; }
+               fixed: 1 0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2 {relative: 0.3 0.0; to_y: "padding_bottom"; }
+            }
+            description { state: "icononly" 0.0;;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               align: 0.5 0.5;
+            }
+         }
+         part { name: "label.bg";
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+            }
+         }
+         part { name: "elm.swallow.label";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.bg";
+            description { state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               min: 1 1;
+               align: 0.0 0.5;
+               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text";}
+               rel2 { relative: 0.0 0.0; to_x: "padding_right";}
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "disabler";
+            repeat_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               min: 1 1;
+               align: 0.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "segment";}
+               rel2 { relative: 1.0 1.0; to: "segment";}
+               color: 255 255 255 150;
+            }
+            description { state: "disabled_single" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_single_normal.png";
+                  border: 7 7 7 7;
+               }
+            }
+            description { state: "disabled_left" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_left_normal.png";
+                  border:  6 1 7 7;
+               }
+            }
+            description { state: "disabled_right" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_right_normal.png";
+                  border: 1 6 7 7;
+               }
+            }
+            description { state: "disabled_middle" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "seg_middle_normal.png";
+                  border: 2 2 2 2;
+               }
+            }
+         }
+      }
+      programs {
+         script {
+            public seg_type; // 1-Single, 2-Left, 3-Middle, 4-Right.
+            public seg_state; // 1-Normal/Default, 2-Pressed, 3-Selected.
+            public seg_status;// 0-Enabled/Default, 1-Disabled
+         
+            public update_state() { 
+               new type, state, disabled;
+               type = get_int(seg_type);
+               state = get_int(seg_state);
+               disabled = get_int(seg_status);
 
+               if( state ==1 )
+                 {
+                    if(type == 1)
+                      set_state(PART:"segment", "default_single", 0.0);
+                    else if(type == 2)
+                      set_state(PART:"segment", "default_left", 0.0);
+                    else if(type == 3)
+                      set_state(PART:"segment", "default_middle", 0.0);
+                    else if(type == 4)
+                      set_state(PART:"segment", "default_right", 0.0);
+                 }
+               else if( state == 2 )
+                 {
+                    if(type == 1)
+                      set_state(PART:"segment", "pressed_single", 0.0);
+                    else if(type == 2)
+                      set_state(PART:"segment", "pressed_left", 0.0);
+                    else if(type == 3)
+                      set_state(PART:"segment", "pressed_middle", 0.0);
+                    else if(type == 4)
+                      set_state(PART:"segment", "pressed_right", 0.0);
+                 }
+               else if( state == 3 )
+                 {
+                    if(type == 1)
+                      set_state(PART:"segment", "selected_single", 0.0);
+                    else if(type == 2)
+                      set_state(PART:"segment", "selected_left", 0.0);
+                    else if(type == 3)
+                      set_state(PART:"segment", "selected_middle", 0.0);
+                    else if(type == 4)
+                      set_state(PART:"segment", "selected_right", 0.0);
+                 }
+               if( disabled == 1 )
+                 {
+                    if(type == 1)
+                      set_state(PART:"disabler", "disabled_single", 0.0);
+                    else if(type == 2)
+                      set_state(PART:"disabler", "disabled_left", 0.0);
+                    else if(type == 3)
+                      set_state(PART:"disabler", "disabled_middle", 0.0);
+                    else if(type == 4)
+                      set_state(PART:"disabler", "disabled_right", 0.0);
+                 }
+            }
+         }
+         program {
+            name: "segment_type_s";
+            signal: "elm,type,segment,single";
+            source: "elm";
+            script {
+               set_int(seg_type, 1);
+               update_state();
+            }
+         }
+         program {
+            name: "segment_type_l";
+            signal: "elm,type,segment,left";
+            source: "elm";     
+            script {
+               set_int(seg_type, 2);
+               update_state();
+            }
+         }
+         program {
+            name: "segment_type_m";
+            signal: "elm,type,segment,middle";
+            source: "elm";
+            script {
+               set_int(seg_type, 3);
+               update_state();
+            }
+         }
+         program {
+            name: "segment_type_r";
+            signal: "elm,type,segment,right";
+            source: "elm";
+            script {
+               set_int(seg_type, 4);
+               update_state();
+            }
+         }
+         program {
+            name: "normal_segment";
+            signal: "elm,state,segment,normal";
+            source: "elm";
+            script {
+               set_int(seg_state, 1);
+               update_state();
+            }
+         }
+         program {
+            name: "pressed_segment";
+            signal: "elm,state,segment,pressed";
+            source: "elm";
+            script {
+               set_int(seg_state, 2);
+               update_state();
+            }
+         }
+         program {
+            name: "selected_segment";
+            signal: "elm,state,segment,selected";
+            source: "elm";
+            script {
+               set_int(seg_state, 3 );
+               update_state();
+            }
+         }
+         program { name: "disable_segment";
+            signal: "elm,state,disabled";
+            source: "elm";
+            script {
+               set_int(seg_status, 1);
+               update_state();
+            }
+         }
+         program { name: "enable_segment";
+            signal: "elm,state,enabled";
+            source: "elm";
+            script {
+               set_int(seg_status, 0);
+               update_state();
+            }
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.icon", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                 {
+                    set_state(PART:"elm.swallow.icon", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               set_state(PART:"elm.swallow.label", "visible", 0.0);
+            }
+         }
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.icon", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.icon", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.swallow.label", "default", 0.0);
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.label", st, 30, vl);
+               if (!strcmp(st, "normal"))
+                 {
+                    set_state(PART:"elm.swallow.icon", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               else
+                 {
+                    set_state(PART:"elm.swallow.icon", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.swallow.icon";
+         }
+      }
+   }
+   group { name: "elm/label/base/segment_normal";
+      data.item: "default_font_size" "24";
+      data.item: "min_font_size" "16";
+      data.item: "max_font_size" "24";
+      styles {
+         style { name: "seg_text_style_normal";
+            base: "font=Sans font_size=16 style=shadow \
+            shadow_color=#2924224d \
+            align=center \
+            color=#ffffffff wrap=char";
+            tag:  "br" "\n";
+            tag:  "hilight" "+ font=Sans:style=Bold";
+            tag:  "tab" "\t";
+         }
+         style { name: "seg_text_style_selected";
+            base: "font=Sans:style=Bold font_size=16 style=shadow \
+            shadow_color=#aaaaaa4d \
+            align=center \
+            color=#111111ff wrap=char";
+            tag:  "br" "\n";
+            tag:  "hilight" "+ font=Sans:style=Bold";
+            tag:  "b" "+ font=Sans:style=Bold";
+            tag:  "tab" "\t";
+         }
+         style { name: "seg_text_style_disabled";
+            base: "font=SLP:style=Medium font_size=24 style=shadow \
+            shadow_color=#2924224d \
+            align=center color=#2924224d \
+            wrap=char";
+            tag:  "br" "\n";
+            tag:  "hilight" "+ font=SLP:style=Bold";
+            tag:  "b" "+ font=SLP:style=Bold";
+            tag:  "tab" "\t";
+         }
+      }
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1.relative, 0.0 0.0;
+               rel2.relative, 1.0 1.0;
+            }
+         }
+         part { name: "label.text.clip";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1 { relative: 0 0; to: "label.swallow.background"; }
+               rel2 { relative: 1 1; to: "label.swallow.background"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            effect: SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.text.clip";
+            description { state: "default" 0.0;
+               rel1.relative, 0.0 0.0;
+               rel2.relative, 1.0 1.0;
+               align: 0.0 0.5;
+               text {
+                  style: "seg_text_style_normal";
+                  align: 0.0 0.5;
+                  min: 1 0;
+               }
+            }
+         }
+      }
+   }
+   
+   group { name: "elm/label/base/segment_pressed";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "16";
+   data.item: "max_font_size" "24";
+   parts {
+      part { name: "label.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+         }
+      }
+      part { name: "label.text.clip";
+         type: RECT;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1 { relative: 0 0; to: "label.swallow.background"; }
+            rel2 { relative: 1 1; to: "label.swallow.background"; }
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         effect: SHADOW;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "label.text.clip";
+         description { state: "default" 0.0;
+            rel1.relative, 0.0 0.0;
+            rel2.relative, 1.0 1.0;
+            align: 0.0 0.5;
+            text {
+               style: "seg_text_style_selected";
+               align: 0.0 0.5;
+               min: 1 0;
+            }
+         }
+      }
+   }
+}
+   
+   group { name: "elm/label/base/segment_selected";
+      data.item: "default_font_size" "24";
+      data.item: "min_font_size" "16";
+      data.item: "max_font_size" "24";
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1.relative, 0.0 0.0;
+               rel2.relative, 1.0 1.0;
+            }
+         }
+         part { name: "label.text.clip";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1 { relative: 0 0; to: "label.swallow.background"; }
+               rel2 { relative: 1 1; to: "label.swallow.background"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            effect: SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.text.clip";
+            description { state: "default" 0.0;
+               rel1.relative, 0.0 0.0;
+               rel2.relative, 1.0 1.0;
+               align: 0.0 0.5;
+               text {
+                  style: "seg_text_style_selected";
+                  align: 0.0 0.5;
+                  min: 1 0;
+               }
+            }
+         }
+      }
+   }
+   group { name: "elm/label/base/segment_disabled";
+      data.item: "default_font_size" "24";
+      data.item: "min_font_size" "16";
+      data.item: "max_font_size" "24";
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1.relative, 0.0 0.0;
+               rel2.relative, 1.0 1.0;
+            }
+         }
+         part { name: "label.text.clip";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1 { relative: 0 0; to: "label.swallow.background"; }
+               rel2 { relative: 1 1; to: "label.swallow.background"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            effect: SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.text.clip";
+            description { state: "default" 0.0;
+               rel1.relative, 0.0 0.0;
+               rel2.relative, 1.0 1.0;
+               align: 0.0 0.5;
+               text {
+                  style: "seg_text_style_disabled";
+                  align: 0.0 0.5;
+                  min: 1 0;
+               }
+            }
+         }
+      }
+   }
 ///////////////////////////////////////////////////////////////////////////////
    group { name: "elm/focus_highlight/top/default";
       images {

diff --git a/data/themes/seg_left_normal.png b/data/themes/seg_left_normal.png
new file mode 100644 (file)
index 0000000..703c363
Binary files /dev/null and b/data/themes/seg_left_normal.png differ

diff --git a/data/themes/seg_left_pressed.png b/data/themes/seg_left_pressed.png
new file mode 100644 (file)
index 0000000..120cc39
Binary files /dev/null and b/data/themes/seg_left_pressed.png differ

diff --git a/data/themes/seg_left_selected.png b/data/themes/seg_left_selected.png
new file mode 100644 (file)
index 0000000..0abb452
Binary files /dev/null and b/data/themes/seg_left_selected.png differ

diff --git a/data/themes/seg_middle_normal.png b/data/themes/seg_middle_normal.png
new file mode 100644 (file)
index 0000000..d0fa761
Binary files /dev/null and b/data/themes/seg_middle_normal.png differ

diff --git a/data/themes/seg_middle_pressed.png b/data/themes/seg_middle_pressed.png
new file mode 100644 (file)
index 0000000..bb7c821
Binary files /dev/null and b/data/themes/seg_middle_pressed.png differ

diff --git a/data/themes/seg_middle_selected.png b/data/themes/seg_middle_selected.png
new file mode 100644 (file)
index 0000000..368d95f
Binary files /dev/null and b/data/themes/seg_middle_selected.png differ

diff --git a/data/themes/seg_right_normal.png b/data/themes/seg_right_normal.png
new file mode 100644 (file)
index 0000000..a5391d4
Binary files /dev/null and b/data/themes/seg_right_normal.png differ

diff --git a/data/themes/seg_right_pressed.png b/data/themes/seg_right_pressed.png
new file mode 100644 (file)
index 0000000..9ae9c26
Binary files /dev/null and b/data/themes/seg_right_pressed.png differ

diff --git a/data/themes/seg_right_selected.png b/data/themes/seg_right_selected.png
new file mode 100644 (file)
index 0000000..3c420fe
Binary files /dev/null and b/data/themes/seg_right_selected.png differ

diff --git a/data/themes/seg_single_normal.png b/data/themes/seg_single_normal.png
new file mode 100644 (file)
index 0000000..f952454
Binary files /dev/null and b/data/themes/seg_single_normal.png differ

diff --git a/data/themes/seg_single_pressed.png b/data/themes/seg_single_pressed.png
new file mode 100644 (file)
index 0000000..bdda5ac
Binary files /dev/null and b/data/themes/seg_single_pressed.png differ

diff --git a/data/themes/seg_single_selected.png b/data/themes/seg_single_selected.png
new file mode 100644 (file)
index 0000000..116ce68
Binary files /dev/null and b/data/themes/seg_single_selected.png differ

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index dcdcb0f..22511df 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -78,6 +78,7 @@ test_multi.c \
 test_floating.c \
 test_launcher.c \
 test_anim.c \
+test_segment_control.c \
 test_calendar.c \
 test_diskselector.c \
 test_ctxpopup.c 

diff --git a/src/bin/test.c b/src/bin/test.c
index 6878f5d..af8fc60 100644 (file)
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -81,6 +81,7 @@ void test_launcher(void *data, Evas_Object *obj, void *event_info);
 void test_launcher2(void *data, Evas_Object *obj, void *event_info);
 void test_launcher3(void *data, Evas_Object *obj, void *event_info);
 void test_anim(void *data, Evas_Object *obj, void *event_info);
+void test_segment_control(void *data, Evas_Object *obj, void *event_info);
 void test_diskselector(void *data, Evas_Object *obj, void *event_info);
 void test_ctxpopup(void *data, Evas_Object *obj, void *event_info);
 
@@ -277,6 +278,7 @@ my_win_main(void)
    ADD_TEST("Conformant", test_conformant);
    ADD_TEST("Multi Touch", test_multi);
    ADD_TEST("Floating Objects", test_floating);
+   ADD_TEST("Segment Control", test_segment_control);
    ADD_TEST("Launcher", test_launcher);
    ADD_TEST("Launcher 2", test_launcher2);
    ADD_TEST("Launcher 3", test_launcher3);

diff --git a/src/bin/test_segment_control.c b/src/bin/test_segment_control.c
new file mode 100644 (file)
index 0000000..1f0d612
--- /dev/null
+++ b/src/bin/test_segment_control.c
@@ -0,0 +1,135 @@
+#include <Elementary.h>
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+#ifndef ELM_LIB_QUICKLAUNCH
+
+static Evas_Object* btn1 = NULL;
+static Evas_Object* btn2 = NULL;
+static Evas_Object* btn3 = NULL;
+
+
+static void
+_cb1( void* data, Evas_Object* obj, void* event_info)
+{
+   Elm_Segment_Item *it1 = elm_segment_control_item_selected_get( data );
+   elm_segment_control_item_del(it1);
+   return;
+}
+
+
+static void
+_cb3( void* data, Evas_Object* obj, void* event_info)
+{
+   Elm_Segment_Item *it1;
+   char buf[PATH_MAX];
+   Evas_Object *ic1 = elm_icon_add(obj);
+   snprintf(buf, sizeof(buf), "%s/images/icon_00.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic1, buf, NULL);
+   evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
+
+
+   it1 = elm_segment_control_item_insert_at(data, ic1, "Inserted Item", 0);
+   elm_segment_control_item_label_set(it1, "Inserted Item");
+   return;
+}
+
+static void
+_cb2( void* data, Evas_Object* obj, void* event_info)
+{
+   Elm_Segment_Item *it1;
+   char buf[PATH_MAX];
+   Evas_Object *ic1;
+
+   it1 = elm_segment_control_item_add(data, NULL, "Added Item");
+
+   ic1 = elm_icon_add(obj);
+   snprintf(buf, sizeof(buf), "%s/images/logo.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic1, buf, NULL);
+   evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
+   elm_segment_control_item_icon_set(it1, ic1);
+
+   return;
+}
+
+void
+test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win, *bg, *bx, *ic, *ic1;
+   Elm_Segment_Item *it1, *it2, *it3;
+
+
+   Evas_Object * in_layout;
+   Evas_Object *segment;
+   char buf[PATH_MAX];
+   char buf1[PATH_MAX];
+   char buf2[PATH_MAX];
+   Evas_Object *check;
+
+   win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Segment Control");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+
+   in_layout = elm_layout_add( win );
+   snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR);
+   elm_layout_file_set(in_layout, buf, "segment_test");
+   evas_object_size_hint_weight_set(in_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+   ic = elm_icon_add(in_layout);
+   snprintf(buf1, sizeof(buf1), "%s/images/logo.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic, buf1, NULL);
+   evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
+
+   ic1 = elm_icon_add(in_layout);
+   snprintf(buf2, sizeof(buf2), "%s/images/icon_00.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic1, buf2, NULL);
+   evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
+
+   segment = elm_segment_control_add(win);
+
+   it1 = elm_segment_control_item_add(segment, NULL, "Only Text");
+   it2 = elm_segment_control_item_add(segment, ic, NULL);
+   elm_segment_control_item_selected_set(it2, EINA_TRUE);
+   it3 = elm_segment_control_item_add(segment, ic1, "Text_Icon_test");
+
+   elm_object_disabled_set(segment, EINA_TRUE);
+   btn1 = elm_button_add(win);
+
+   elm_button_label_set(btn1, "Delete");
+   evas_object_show(btn1);
+
+   btn2 = elm_button_add(win);
+   elm_button_label_set(btn2, "Add");
+   evas_object_show(btn2);
+
+   btn3 = elm_button_add(win);
+   elm_button_label_set(btn3, "Insert");
+   evas_object_show(btn3);
+
+   evas_object_smart_callback_add( btn1, "clicked", _cb1, segment);
+   evas_object_smart_callback_add( btn2, "clicked", _cb2, segment);
+   evas_object_smart_callback_add( btn3, "clicked", _cb3, segment);
+
+   evas_object_show(segment);
+   elm_layout_content_set(in_layout, "segment", segment);
+   elm_layout_content_set(in_layout, "add", btn2);
+   elm_layout_content_set(in_layout, "del", btn1);
+   elm_layout_content_set(in_layout, "insert", btn3);
+
+   elm_box_pack_end(bx, in_layout);
+   evas_object_show(in_layout);
+
+   evas_object_show(win);
+}
+#endif
+

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 9d5a072..dbc499f 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1921,20 +1921,31 @@ extern "C" {
 
    /* SegmentControl */
    typedef struct _Elm_Segment_Item Elm_Segment_Item;
-   EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent);
-   EAPI void         elm_segment_control_item_selected_set(Elm_Segment_Item *item, Eina_Bool select);
-   EAPI Elm_Segment_Item * elm_segment_control_item_selected_get(const Evas_Object *obj);
-   EAPI int          elm_segment_control_item_index_get(Elm_Segment_Item *item);
-   EAPI Evas_Object *elm_segment_control_item_object_get(Elm_Segment_Item *it);
-   EAPI Evas_Object *elm_segment_control_item_label_object_set(Elm_Segment_Item *item, char *label);   
-   EAPI Elm_Segment_Item * elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate);
-   EAPI void elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate);
-   EAPI void elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate);
-   EAPI void elm_segment_control_delete_segment_at(Evas_Object *obj,  unsigned int index, Eina_Bool animate);
-   EAPI const char  *elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index);
-   EAPI Evas_Object *elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index);  
-   EAPI Elm_Segment_Item *elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value);
-   EAPI int elm_segment_control_get_segment_count(Evas_Object *obj);   
+   EAPI Evas_Object      *elm_segment_control_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
+   EAPI Elm_Segment_Item *elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *label) EINA_ARG_NONNULL(1);
+   EAPI Elm_Segment_Item *elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const char *label, int index) EINA_ARG_NONNULL(1);
+   EAPI void              elm_segment_control_item_del(Elm_Segment_Item *it) EINA_ARG_NONNULL(1);
+   EAPI void              elm_segment_control_item_del_at(Evas_Object *obj, int index) EINA_ARG_NONNULL(1);
+   EAPI int               elm_segment_control_item_count_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EAPI Elm_Segment_Item *elm_segment_control_item_get(const Evas_Object *obj, int index) EINA_ARG_NONNULL(1);
+   EAPI const char       *elm_segment_control_item_label_get(Evas_Object *obj, int index) EINA_ARG_NONNULL(1);
+   EAPI void              elm_segment_control_item_label_set(Elm_Segment_Item* it, const char* label) EINA_ARG_NONNULL(1);
+   EAPI Evas_Object      *elm_segment_control_item_icon_get(const Evas_Object *obj, int index) EINA_ARG_NONNULL(1);
+   EAPI void              elm_segment_control_item_icon_set(Elm_Segment_Item *it,  Evas_Object *icon) EINA_ARG_NONNULL(1);
+   EAPI int               elm_segment_control_item_index_get(const Elm_Segment_Item *it) EINA_ARG_NONNULL(1);
+   EAPI Evas_Object      *elm_segment_control_item_object_get(const Elm_Segment_Item *it) EINA_ARG_NONNULL(1);
+   EAPI Elm_Segment_Item *elm_segment_control_item_selected_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EAPI void              elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select) EINA_ARG_NONNULL(1);
+   EINA_DEPRECATED EAPI int               elm_segment_control_get_segment_count(Evas_Object *obj);
+   EINA_DEPRECATED EAPI Elm_Segment_Item *elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value);
+   EINA_DEPRECATED EAPI Evas_Object      *elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index);
+   EINA_DEPRECATED EAPI const char       *elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index);
+   EINA_DEPRECATED EAPI void              elm_segment_control_delete_segment_at(Evas_Object *obj, unsigned int index, Eina_Bool animate);
+   EINA_DEPRECATED EAPI void              elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate);
+   EINA_DEPRECATED EAPI void              elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate);
+   EINA_DEPRECATED EAPI Elm_Segment_Item *elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate);
+   EINA_DEPRECATED EAPI Evas_Object      *elm_segment_control_item_label_object_set(Elm_Segment_Item *item, char *label);
+
 
    EAPI Evas_Object *elm_page_control_add(Evas_Object *parent);
    EAPI void         elm_page_control_page_count_set(Evas_Object *obj, unsigned int page_count);

diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index d7a2068..ac0588f 100644 (file)
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -5,718 +5,470 @@
  * @defgroup SegmentControl SegmentControl
  * @ingroup Elementary
  *
- * SegmentControl object is a horizontal control made of multiple segments,
- * each segment item functioning as a discrete button. A segmented control affords a compact means to group together a number of controls.
- * A segmented control can display a title or an image. The UISegmentedControl object automatically resizes segment items to fit proportionally
- * within their superview unless they have a specific width set. When you add and remove segments,
- * you can request that the action be animated with sliding and fading effects.
+ * SegmentControl Widget is a horizontal control made of multiple segments, each segment item
+ * functioning similar to discrete two state button. A segmented control affords a compact means to group together a number of controls.
+ * Only one Segment item can be at selected state. A segmented control item can display combination of Text and any Evas_Object like layout or other widget.
  */
 typedef struct _Widget_Data Widget_Data;
+
 struct _Widget_Data
 {
-   Evas_Object *box;
+   Evas_Object *obj;
    Evas_Object *base;
-   Eina_List *seg_ctrl;
-   Elm_Segment_Item *ani_it;
-   Ecore_Animator *ani;
-   int width, height;
-   int id;
+   Eina_List *seg_items;
+   int item_count;
+   Elm_Segment_Item *selected_item;
    int item_width;
-   int cur_fontsize;
-   int max_height, w_pad, h_pad;
-   unsigned int count;
-   int insert_index;
-   int del_index;
-   int cur_seg_id;
-   double scale_factor;
-   unsigned int def_color[4];
-   unsigned int press_color[4];
-   unsigned int sel_color[4];
 };
 
 struct _Elm_Segment_Item
 {
-   Evas_Object *obj;
-   Evas_Object *base;
+   Elm_Widget_Item base;
    Evas_Object *icon;
-   Evas_Object *label_wd;
-   const char *label;
-   int segment_id;
-   Eina_Bool delete_me : 1;
-   Eina_Bool sel : 1;
+   Evas_Object *label;
+   int seg_index;
 };
 
-#define MAXTOKENS 5
-
-char **_split(const char *string, char *delim);
-static void _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static void _mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _signal_segment_on(void *data);
-static void _signal_segment_off(void *data);
-static void _theme_hook(Evas_Object *obj);
-static void _item_free(Evas_Object *obj, Elm_Segment_Item *it);
+static const char *widtype = NULL;
+static void _sizing_eval(Evas_Object *obj);
 static void _del_hook(Evas_Object *obj);
-static void _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-static void _segment_resizing(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _segment_item_resizing(void *data, Evas *e, Evas_Object *obj, void *event_info);
-#if 0
-static void _object_resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
-#endif
-static void _update_list(Evas_Object *obj);
-static void _refresh_segment_ids(Evas_Object *obj);
-static void _state_value_set(Evas_Object *obj);
-static void _color_value_get(Evas_Object *obj);
-
-static Elm_Segment_Item* _item_new(Evas_Object *obj, const char *label, Evas_Object *icon);
-static Elm_Segment_Item *_item_find(Evas_Object *obj, unsigned int index);
-
-static Eina_Bool _animator_animate_add_cb(void *data);
-static Eina_Bool _animator_animate_del_cb(void *data);
+static void _theme_hook(Evas_Object *obj);
+static void _disable_hook(Evas_Object *obj);
+static void _item_free(Elm_Segment_Item *it);
+static void _segment_off(Elm_Segment_Item *it);
+static void _segment_on(Elm_Segment_Item *it);
+static void _position_items(Widget_Data *wd);
+static void _on_move_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+                void *event_info __UNUSED__);
+static void _mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+                void *event_info __UNUSED__);
+static void _mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+                void *event_info __UNUSED__);
+static void _swallow_item_objects(Elm_Segment_Item *it);
+static void _update_list(Widget_Data *wd);
+static Elm_Segment_Item * _item_find(const Evas_Object *obj, int index);
+static Elm_Segment_Item* _item_new(Evas_Object *obj, Evas_Object *icon, const char *label );
 
 static void
-_signal_segment_off(void *data)
+_sizing_eval(Evas_Object *obj)
 {
-    Elm_Segment_Item *item = (Elm_Segment_Item *) data;
-    Widget_Data *wd = elm_widget_data_get(item->obj);
-    if (!wd) return;
-    
-//    item->sel = EINA_FALSE;
-    edje_object_signal_emit(item->base, "elm,action,unfocus", "elm");
-    edje_object_signal_emit(item->base, "elm,state,segment,release", "elm");
-    if(!item->label_wd && item->label)
-      edje_object_signal_emit(item->base, "elm,state,text,visible", "elm");
-    if(item->label_wd)
-      elm_label_text_color_set(item->label_wd, wd->def_color[0], wd->def_color[1], wd->def_color[2], wd->def_color[3]);
-
-    return;
-}
+   Widget_Data *wd;
+   Evas_Coord minw = -1, minh = -1;
+   Evas_Coord w, h;
 
+   wd = elm_widget_data_get(obj);
+   if (!wd) return;
+
+   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+   edje_object_size_min_restricted_calc(wd->base, &minw, &minh, minw, minh);
+   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+
+   evas_object_size_hint_min_get(obj, &w, &h);
+   if (w > minw) minw = w;
+   if (h > minh) minh = h;
+   evas_object_size_hint_min_set(obj, minw, minh);
+}
 
 static void
-_signal_segment_on(void *data)
+_del_hook(Evas_Object *obj)
 {
-   Elm_Segment_Item *item = (Elm_Segment_Item *) data;
    Elm_Segment_Item *it;
-   Eina_List *l;
+   Widget_Data *wd;
 
-   Widget_Data *wd = elm_widget_data_get(item->obj);
+   wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-//   item->sel = EINA_TRUE;
-   if (item->segment_id == wd->cur_seg_id) return;
+   EINA_LIST_FREE(wd->seg_items, it) _item_free(it);
 
-   EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
-     {
-        if (it->segment_id == wd->cur_seg_id)
-         {
-            _signal_segment_off (it);
-         }
-     }
-   edje_object_signal_emit(item->base, "elm,action,focus", "elm");
-   if(!item->label_wd)
-     edje_object_signal_emit(item->base, "elm,state,text,change", "elm");
-   if(item->label_wd)
-     elm_label_text_color_set(item->label_wd, wd->sel_color[0],wd->sel_color[1], wd->sel_color[1], wd->sel_color[3]);
-
-   wd->cur_seg_id = item->segment_id;
-   evas_object_smart_callback_call(item->obj, "changed", (void*)wd->cur_seg_id);
-
-   return;
+   free(wd);
 }
 
 static void
-_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_theme_hook(Evas_Object *obj)
 {
-   Elm_Segment_Item *item = (Elm_Segment_Item *) data;
-   Widget_Data *wd = elm_widget_data_get(item->obj);
+   Eina_List *l;
+   Elm_Segment_Item *it;
+   Widget_Data *wd;
+
+   wd = elm_widget_data_get(obj);
    if (!wd) return;
-   if (item->segment_id == wd->cur_seg_id)
+
+   _elm_theme_object_set(obj, wd->base, "segment_control", "base", elm_widget_style_get(obj));
+   edje_object_scale_set(wd->base, elm_widget_scale_get(wd->base) *_elm_config->scale);
+
+   EINA_LIST_FOREACH(wd->seg_items, l, it)
      {
-        if(!item->label_wd)
-          edje_object_signal_emit(item->base, "elm,state,text,change", "elm");
-//        item->sel = EINA_TRUE;
-        return;
+        _elm_theme_object_set(obj, it->base.view, "segment_control", "item", elm_widget_style_get(obj));
+        edje_object_scale_set(it->base.view, elm_widget_scale_get(it->base.view) *_elm_config->scale);
      }
-    _signal_segment_on((void*)item);
 
-    return;
+   _update_list(wd);
+   _sizing_eval(obj);
 }
 
 static void
-_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_disable_hook(Evas_Object *obj)
 {
-   Elm_Segment_Item *item = (Elm_Segment_Item *) data;
-   Widget_Data *wd = elm_widget_data_get(item->obj);
+   Widget_Data *wd;
 
+   wd = elm_widget_data_get(obj);
    if (!wd) return;
-   
-   if(!item->label_wd && wd->cur_seg_id != item->segment_id)
-     {
-        edje_object_signal_emit(item->base, "elm,state,text,pressed", "elm");
-     }
-   if(item->label_wd && wd->cur_seg_id != item->segment_id)
-     elm_label_text_color_set(item->label_wd, wd->press_color[0], wd->press_color[1], wd->press_color[2], wd->press_color[3]);
-
-   edje_object_signal_emit(item->base, "elm,state,segment,press", "elm");
-   return;
+   _update_list(wd);
 }
 
-static void
-_theme_hook(Evas_Object *obj)
+#if 0
+static void *
+_elm_list_data_get(const Eina_List *list)
 {
-   _elm_theme_object_set(obj, obj, "segmented-control", "base", elm_widget_style_get(obj));
+   Elm_Segment_Item *it = eina_list_data_get(list);
 
-   return;
+   if (it) return NULL;
+
+   edje_object_signal_emit(it->base.view, "elm,state,segment,selected", "elm");
+   return it->base.view;
 }
 
-static void
-_item_free(Evas_Object *obj, Elm_Segment_Item *it)
+/* TODO Can focus stay on Evas_Object which is not a elm_widget ?? */
+static Eina_Bool
+_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
+   static int count=0;
+   Widget_Data *;
+   const Eina_List *items;
+   void *(*list_data_get) (const Eina_List *list);
 
-   if(wd->seg_ctrl)
-     wd->seg_ctrl = eina_list_remove(wd->seg_ctrl, it);
+   wd = elm_widget_data_get(obj)
+   if ((!wd)) return EINA_FALSE;
 
-   if(it->icon) evas_object_del(it->icon);
-   if(it->label_wd) 
+   /* Focus chain */
+   /* TODO: Change this to use other chain */
+   if ((items = elm_widget_focus_custom_chain_get(obj)))
+     list_data_get = eina_list_data_get;
+   else
      {
-        evas_object_del(it->label_wd);
-       it->label_wd = NULL;
-       if (edje_object_part_swallow_get(it->base, "elm.swallow.label.content") == NULL) 
-          {
-             edje_object_part_unswallow(it->base, it->label_wd);
-         }
+        items = wd->seg_items;
+        list_data_get = _elm_list_data_get;
+        if (!items) return EINA_FALSE;
      }
-   if(it->base) evas_object_del(it->base);
-   if(it->label) eina_stringshare_del(it->label);
-
-   if(it)
-     free(it);
-   it = NULL;
-   
-   return;
+   return elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next);
 }
+#endif
 
 static void
-_del_hook(Evas_Object *obj)
+_item_free(Elm_Segment_Item *it)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   Elm_Segment_Item *it;
-   Eina_List *l, *clear = NULL;
+   Widget_Data *wd;
 
-   EINA_LIST_FOREACH(wd->seg_ctrl, l, it) clear = eina_list_append(clear, it);
-   EINA_LIST_FREE(clear, it) _item_free(obj, it);
+   if (!it) return;
 
-   if(wd) free(wd);
-   wd = NULL;
+   wd = elm_widget_item_data_get(it);
+   if (!wd) return;
 
-   return;
-}
+   if(wd->selected_item == it) wd->selected_item = NULL;
+   if(wd->seg_items) wd->seg_items = eina_list_remove(wd->seg_items, it);
 
+   elm_widget_item_pre_notify_del(it);
 
-static void
-_layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data)
-{
-   Widget_Data *wd = data;
-   if (!wd) return;
-   _els_box_layout(o, priv, 1, 0); /* making box layout non homogenous */
+   if (it->icon) evas_object_del(it->icon);
+   if (it->label) evas_object_del(it->label);
 
-   return;
+   elm_widget_item_del(it);
 }
 
 static void
-_segment_resizing(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_segment_off(Elm_Segment_Item *it)
 {
-   Widget_Data *wd = elm_widget_data_get((Evas_Object *)data);
-   if (!wd) return;
-   Evas_Coord w = 0, h = 0;
+   Widget_Data *wd;
 
-   evas_object_geometry_get(wd->base, NULL, NULL, &w, &h);
-   wd->item_width = wd->width = w;
-   wd->height = h;
+   if (!it) return;
 
-   _state_value_set((Evas_Object *)data);
-}
-#if 0
-static void 
-_object_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-   Widget_Data *wd;
-   if(!data) return;
-   wd = elm_widget_data_get((Evas_Object *)data);
-   if(!wd) return;
+   wd = elm_widget_item_data_get(it);
+   if (!wd) return;
+
+   edje_object_signal_emit(it->base.view, "elm,state,segment,normal", "elm");
+   if (it->label) elm_object_style_set(it->label, "segment_normal");
 
-   ecore_job_add(_segment_resizing, (Evas_Object *)data);
+   if (wd->selected_item == it) wd->selected_item = NULL;
 }
-#endif
 
 static void
-_segment_item_resizing(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_segment_on(Elm_Segment_Item *it)
 {
    Widget_Data *wd;
-   Elm_Segment_Item *it = (Elm_Segment_Item *)data; 
-   wd = elm_widget_data_get(it->obj);
 
-   if(!wd) return;
-   Evas_Coord w = 0, h = 0;
-   _update_list(it->obj);
+   if (!it) return;
 
-   evas_object_geometry_get(it->base, NULL, NULL, &w, &h);
+   wd = elm_widget_item_data_get(it);
+   if (!wd) return;
+   if (it == wd->selected_item) return;
 
-   if(wd->max_height == 1) wd->max_height = h;
+   if (wd->selected_item) _segment_off(wd->selected_item);
 
-   if(it->label_wd) 
-     {
-       elm_label_wrap_width_set(it->label_wd, w-wd->w_pad);
-       elm_label_wrap_height_set(it->label_wd, wd->max_height-wd->h_pad);
-
-       if (edje_object_part_swallow_get(it->base, "elm.swallow.label.content") == NULL)
-         {
-            edje_object_part_unswallow(it->base, it->label_wd);
-         }
-       edje_object_part_swallow(it->base, "elm.swallow.label.content", it->label_wd);
-       edje_object_signal_emit(it->base, "elm,state,label,visible", "elm");
-        if (it->segment_id == wd->cur_seg_id)
-          {
-            elm_label_text_color_set(it->label_wd, wd->sel_color[0], wd->sel_color[1], wd->sel_color[2], wd->sel_color[3]);
-          }
-        else
-          elm_label_text_color_set(it->label_wd, wd->def_color[0], wd->def_color[1], wd->def_color[2], wd->def_color[3]);
-     }
-}
-#if 0
-static void 
-_object_item_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-   ecore_job_add(_segment_item_resizing, (Evas_Object *)data);
+   edje_object_signal_emit(it->base.view, "elm,state,segment,selected", "elm");
+   if (it->label) elm_object_style_set(it->label, "segment_selected");
+
+   wd->selected_item = it;
+   evas_object_smart_callback_call(wd->obj, "changed", (void*) it->seg_index);
 }
-#endif
 
-static Elm_Segment_Item*
-_item_new(Evas_Object *obj, const char *label, Evas_Object *icon)
+static void
+_position_items(Widget_Data *wd)
 {
-   Elm_Segment_Item *it; 
-   Evas_Coord mw, mh; 
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-
-   it = calloc(1, sizeof(   Elm_Segment_Item));
-   if (!it) return NULL;
+   Eina_List *l;
+   Elm_Segment_Item *it;
+   int bx, by, bw, bh, position;
 
-   if(obj) it->obj = obj;
-   it->delete_me = EINA_FALSE;
-   it->segment_id = wd->id;
-   it->label_wd = NULL;
-//   it->sel = EINA_FALSE;
+   wd->item_count = eina_list_count(wd->seg_items);
+   if (wd->item_count <= 0) return;
 
-   it->base = edje_object_add(evas_object_evas_get(obj));
-   _elm_theme_object_set(obj, it->obj, "segment", "base/default", elm_object_style_get(obj));
+   evas_object_geometry_get(wd->base, &bx, &by, &bw, &bh);
+   wd->item_width = bw / wd->item_count;
 
-   if (it->label) eina_stringshare_del(it->label);
-   if (label)
+   position = bx;
+   EINA_LIST_FOREACH(wd->seg_items, l, it)
      {
-        it->label = eina_stringshare_add(label);
+        evas_object_move(it->base.view, bx, by );
+        evas_object_resize(it->base.view, wd->item_width, bh );
+        bx += wd->item_width;
      }
-
-   if ((it->icon != icon) && (it->icon))
-     elm_widget_sub_object_del(obj, it->icon);
-   it->icon = icon;
-   if (it->icon) elm_widget_sub_object_add(obj, it->icon);
-
-   edje_object_size_min_restricted_calc(obj, &mw, &mh, 0, 0);
-   evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-   return it;
 }
 
-
-static void 
-_update_list(Evas_Object *obj)
+static void
+_on_move_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+                void *event_info __UNUSED__)
 {
-   Elm_Segment_Item *it = NULL;
-   Elm_Segment_Item *del_it = NULL;
-   Elm_Segment_Item *next_sel_it = NULL;
-   Elm_Segment_Item *seg_it;
+   Widget_Data *wd;
+   Evas_Coord law = 0, lah = 0;
    Eina_List *l;
-   int i = 0;
- 
-   Widget_Data *wd = elm_widget_data_get(obj);
+   Elm_Segment_Item *it = NULL;
+   const char *lbl_area;
+
+   wd = elm_widget_data_get(data);
    if (!wd) return;
 
-   wd->count = eina_list_count(wd->seg_ctrl);
-   if(wd->count == 1)
-     {
-        it = _item_find(obj, 0);
-       _elm_theme_object_set(obj, it->base, "segment", "base/single", elm_object_style_get(obj));\r
-       edje_object_signal_emit(it->base, "elm,state,segment,on", "elm");
-       if(it->label && !it->label_wd)
-         {
-                    edje_object_signal_emit(it->base, "elm,state,text,change", "elm");
-            edje_object_part_text_set(it->base, "elm.text", it->label);
-         }
-       else
-        edje_object_signal_emit(it->base, "elm,state,text,hidden", "elm");
-
-       if(it->icon)
-          {
-            edje_object_part_swallow(it->base, "elm.swallow.content", it->icon);
-            edje_object_signal_emit(it->base, "elm,state,icon,visible", "elm");
-         }
-       else
-         edje_object_signal_emit(it->base, "elm,state,icon,hidden", "elm");
-
-       if(it->label_wd)
-         {
-             edje_object_signal_emit(it->base, "elm,state,label,visible", "elm");
-            elm_label_text_color_set(it->label_wd, wd->sel_color[0], wd->sel_color[1], wd->sel_color[2], wd->sel_color[3]);
-         }
-
-       return;
-     }
+   _position_items(wd);
 
-   EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
+   EINA_LIST_FOREACH(wd->seg_items, l, it)
      {
-        if(i==0)
-          {
-             _elm_theme_object_set(obj, it->base, "segment", "base/first", elm_object_style_get(obj));
-         }
-       else if(i==wd->count-1)
+        lbl_area = edje_object_data_get(it->base.view, "label.wrap.part");
+        if (it->label && lbl_area)
           {
-            _elm_theme_object_set(obj, it->base, "segment", "base/last", elm_object_style_get(obj));
-         }
-       else
-         {
-            _elm_theme_object_set(obj, it->base, "segment", "base/default", elm_object_style_get(obj));
-
-         }
-         
-       if(it->label && !it->label_wd)
-         {
-            edje_object_signal_emit(it->base, "elm,state,text,visible", "elm");
-            edje_object_part_text_set(it->base, "elm.text", it->label);
-         }
-        else
-          edje_object_signal_emit(it->base, "elm,state,text,hidden", "elm");
-
-       if(it->icon)
-         {
-             edje_object_part_swallow(it->base, "elm.swallow.content", it->icon);
-            edje_object_signal_emit(it->base, "elm,state,icon,visible", "elm");
-         }
-       else
-         edje_object_signal_emit(it->base, "elm,state,icon,hidden", "elm");
-
-       if(it->label_wd)
-          {
-             edje_object_signal_emit(it->base, "elm,state,label,visible", "elm");
+             edje_object_part_geometry_get(it->base.view, lbl_area, NULL, NULL, &law, &lah);
+             elm_label_wrap_width_set(it->label, law);
+             elm_label_wrap_height_set(it->label, lah);
           }
-
-       i++;
      }
-
-     i = 0;
-     EINA_LIST_FOREACH(wd->seg_ctrl, l, seg_it)
-       {
-          if(wd->del_index == 0)
-            {
-              if (i == 0)
-                {
-                   next_sel_it = seg_it;
-                   _signal_segment_on((void*)next_sel_it);
-                   break;
-                }
-            }
-          else
-            {
-               if (i == wd->del_index-1)
-                 next_sel_it = seg_it;
-               if (i == wd->del_index)
-                 {
-                    del_it = seg_it;
-                    break;
-                 }
-             }
-          i++;
-       }
-     if(next_sel_it && del_it && del_it->sel)
-       _signal_segment_on((void*)next_sel_it);
 }
 
-
-static void 
-_refresh_segment_ids(Evas_Object *obj)
+static void
+_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+          void *event_info)
 {
+   Widget_Data *wd;
    Elm_Segment_Item *it;
-   Eina_List *l;
-   int i = 0;
-   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Event_Mouse_Up *ev;
+   Evas_Coord x, y, w, h;
+
+   it = data;
+   if (!it) return;
+
+   wd = elm_widget_item_data_get(it);
    if (!wd) return;
 
-   if ((wd->insert_index > 0) && wd->cur_seg_id >= wd->insert_index)
-     {
-        ++wd->cur_seg_id;
-       wd->insert_index = 0;
-     }
-   if (wd->del_index > 0)
-     {
-        if (wd->cur_seg_id >= wd->del_index)
-          --wd->cur_seg_id;
-        wd->del_index = -1;
-     }
+   if (elm_widget_disabled_get(wd->obj)) return;
 
-   EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
+   if (it == wd->selected_item) return;
+
+   ev = event_info;
+   evas_object_geometry_get(it->base.view, &x, &y, &w, &h);
+
+   if((ev->output.x > x) && (ev->output.x < (x+w)) && (ev->output.y > y) && (ev->output.y < (y+h)))
+     _segment_on(it);
+   else
      {
-        it->segment_id = i;
-       i++;
+        edje_object_signal_emit(it->base.view, "elm,state,segment,normal", "elm");
+        if (it->label) elm_object_style_set(it->label, "segment_normal");
      }
 }
 
-static void 
-_state_value_set(Evas_Object *obj)
+static void
+_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+            void *event_info __UNUSED__)
 {
+   Widget_Data *wd;
    Elm_Segment_Item *it;
-   Eina_List *l;
-   Evas_Coord mw, mh, x, y;
 
-   int w1=0, w2, i=0;
-   unsigned int count ;
-   Widget_Data *wd = elm_widget_data_get(obj);
+   it = data;
+   if (!it) return;
+
+   wd = elm_widget_item_data_get(it);
    if (!wd) return;
-   
-   count = eina_list_count(wd->seg_ctrl);
-   if (count > 0)
-     wd->item_width = wd->width/count;
-   if (wd->ani_it)
-     {
-        evas_object_geometry_get(wd->ani_it->base, &x, &y, &w1, NULL);
-       if (wd->ani_it->delete_me)
-         {
-            w1-=(wd->item_width/5);
-            if( w1< 0) w1 = 0;
-         }
-       else
-       {
-           w1+=(wd->item_width/5);
-          if( w1 > wd->item_width )
-             w1 = wd->item_width;
-       }
-       w2 = (wd->width-w1)/(count -1);
-     }
-   else
-      w2 = wd->item_width;
-         
-   EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
-    {
-       edje_object_size_min_restricted_calc(it->base, &mw, &mh, 0, 0);
-       evas_object_size_hint_weight_set(it->base, 1.0, 1.0);
-       evas_object_size_hint_align_set(it->base, -1.0, -1.0);
-       
-               
-       if(wd->ani_it  && it == wd->ani_it)
-         {
-            evas_object_resize(it->base, w1, wd->height);
-           evas_object_size_hint_min_set(it->base, w1, wd->height);
-           evas_object_size_hint_max_set(it->base, w1, wd->height);
-        }
-       else
-         {
-           evas_object_resize(it->base, w2, wd->height);
-           evas_object_size_hint_min_set(it->base, w2, wd->height);
-           evas_object_size_hint_max_set(it->base, w2, wd->height);
-       }
-       ++i;
-    }
-
-    return;
-}
 
-/* split string into tokens, return token array */
-char **
-_split(const char *string, char *delim)
-{
-   char **tokens = NULL;
-   char *working = NULL;
-   char *token = NULL;
-   int idx = 0;
-
-   tokens  = malloc(sizeof(char *) * MAXTOKENS);
-   if(tokens == NULL)
-     return NULL;
-   working = malloc(sizeof(char) * strlen(string) + 1);
-   if(working == NULL)
-     return NULL;
-
-/* to make sure, copy string to a safe place */
-   strcpy(working, string);
-   for(idx = 0; idx < MAXTOKENS; idx++)
-     tokens[idx] = NULL;
-
-   token = strtok(working, delim);
-   idx = 0;
-
-/* always keep the last entry NULL terminated */
-   while((idx < (MAXTOKENS - 1)) && (token != NULL)) {
-     tokens[idx] = malloc(sizeof(char) * strlen(token) + 1);
-     if(tokens[idx] != NULL) {
-       strcpy(tokens[idx], token);
-       idx++;
-       token = strtok(NULL, delim);
-     }
-   }
+   if (elm_widget_disabled_get(wd->obj)) return;
 
- free(working);
- return tokens;
+   if (it == wd->selected_item) return;
+
+   edje_object_signal_emit(it->base.view, "elm,state,segment,pressed", "elm");
+   if (it->label) elm_object_style_set(it->label, "segment_pressed");
 }
 
-static void _color_value_get(Evas_Object *obj)
+static void
+_swallow_item_objects(Elm_Segment_Item *it)
 {
-   Widget_Data *wd = (Widget_Data *)obj;
-   if (!wd) return;
+   Evas_Coord law = 0, lah = 0;
+   const char *lbl_area;
 
-   const char *def_color;
-   const char *press_color;
-   const char *sel_color;
+   if (!it) return;
 
-   char *delim = " ";
-   char **tokens = NULL;
-   int i = 0;
-
-   def_color = edje_object_data_get(wd->base, "def_rgb");
-   if(def_color)
+   if (it->icon)
      {
-        tokens = _split(def_color, delim);
-       for(i = 0; tokens[i] != NULL; i++)
-         {
-            if (tokens[i]) wd->def_color[i] = atoi(tokens[i]);
-            else wd->def_color[i] = 0xFF;
-         }
-       for(i = 0; tokens[i] != NULL; i++)
-         free(tokens[i]);
-       free(tokens);
-       tokens = NULL;
+        edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
+        edje_object_signal_emit(it->base.view, "elm,state,icon,visible", "elm");
      }
    else
-     {
-        for(i = 0; i<(MAXTOKENS - 1); i++)
-         wd->def_color[i] = 0xFF;
-     }
-   press_color = edje_object_data_get(wd->base, "press_rgb");
-   if(press_color)
-     {
-        tokens = _split(press_color, delim);
-       for(i = 0; tokens[i] != NULL; i++)
-         {
-            if (tokens[i]) wd->press_color[i] = atoi(tokens[i]);
-            else wd->press_color[i] = 0xFF;
-         }
-       for(i = 0; tokens[i] != NULL; i++)
-         free(tokens[i]);
-       free(tokens);
-       tokens = NULL;
-     }
-   else
-     {
-        for(i = 0; i<(MAXTOKENS - 1); i++)
-          wd->press_color[i] = 0xFF;
-     }
+     edje_object_signal_emit(it->base.view, "elm,state,icon,hidden", "elm");
 
-   sel_color = edje_object_data_get(wd->base, "sel_rgb");
-   if(sel_color)
+   if (it->label)
      {
-       tokens = _split(sel_color, delim);
-       for(i = 0; tokens[i] != NULL; i++)
-         {
-           if (tokens[i]) wd->sel_color[i] = atoi(tokens[i]);
-           else wd->sel_color[i] = 0xFF;
-        }
-       for(i = 0; tokens[i] != NULL; i++)
-        free(tokens[i]);
-       
-       free(tokens);
-       tokens = NULL;
+        edje_object_part_swallow(it->base.view, "elm.swallow.label", it->label);
+        edje_object_signal_emit(it->base.view, "elm,state,text,visible", "elm");
+
+        lbl_area = edje_object_data_get(it->base.view, "label.wrap.part");
+        if (lbl_area)
+          {
+             edje_object_part_geometry_get(it->base.view, lbl_area, NULL, NULL, &law, &lah );
+             elm_label_wrap_width_set(it->label, law);
+             elm_label_wrap_height_set(it->label, lah);
+          }
      }
    else
-     {
-        for(i = 0; i<(MAXTOKENS - 1); i++)
-         wd->sel_color[i] = 0xFF;
-     }
+     edje_object_signal_emit(it->base.view, "elm,state,text,hidden", "elm");
 }
 
-static Eina_Bool
-_animator_animate_add_cb(void *data)
+static void
+_update_list(Widget_Data *wd)
 {
-   int w;
-   Evas_Object *obj = (Evas_Object *)data;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   Eina_List *l;
+   Elm_Segment_Item *it = NULL;
+   int index = 0;
 
-   evas_object_geometry_get(wd->ani_it->base, NULL, NULL, &w, NULL);
-   if( w <  wd->item_width )
-     {
-         _state_value_set(obj);
-        evas_object_geometry_get(wd->ani_it->base, NULL, NULL, &w, NULL);
-        return ECORE_CALLBACK_RENEW;
-     }
-   else
+   _position_items(wd);
+
+   if (wd->item_count == 1)
      {
-        ecore_animator_del(wd->ani);
-       wd->ani = NULL;
-       wd->ani_it = NULL;
-       return ECORE_CALLBACK_CANCEL;
-     }
-}
+        it = eina_list_nth(wd->seg_items, 0);
+        it->seg_index = 0;
 
+        //Set the segment type
+        edje_object_signal_emit(it->base.view, "elm,type,segment,single", "elm");
 
-static Eina_Bool
-_animator_animate_del_cb(void *data)
-{
-   int w;
-   Evas_Object *obj = (Evas_Object *)data;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;\r
+        //Set the segment state
+        if (wd->selected_item == it)
+          {
+             edje_object_signal_emit(it->base.view, "elm,state,segment,selected", "elm");
+             if (it->label) elm_object_style_set(it->label, "segment_selected");
+          }
+        else
+          edje_object_signal_emit(it->base.view, "elm,state,segment,normal", "elm");
 
-   evas_object_geometry_get(wd->ani_it->base, NULL, NULL, &w, NULL);
-   if( w >  0 )
-     {
-        _state_value_set(obj);
-       evas_object_geometry_get(wd->ani_it->base, NULL, NULL, &w, NULL);
-       return ECORE_CALLBACK_RENEW;
+        if (elm_widget_disabled_get(wd->obj))
+          {
+             edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
+             if (it->label) elm_object_style_set(it->label, "segment_disabled");
+          }
+
+        _swallow_item_objects(it);
+
+        return;
      }
-   else
+
+   EINA_LIST_FOREACH(wd->seg_items, l, it)
      {
-        _item_free(obj, wd->ani_it );
-       _refresh_segment_ids(obj);
-       ecore_animator_del(wd->ani);
-       wd->ani = NULL;
-       wd->ani_it = NULL;
-       _update_list(obj);
-       wd->id = eina_list_count(wd->seg_ctrl);
-       return ECORE_CALLBACK_CANCEL;
+        it->seg_index = index;
+
+        //Set the segment type
+        if(index == 0)
+          edje_object_signal_emit(it->base.view, "elm,type,segment,left", "elm");
+        else if(index == wd->item_count-1)
+          edje_object_signal_emit(it->base.view, "elm,type,segment,right", "elm");
+        else
+          edje_object_signal_emit(it->base.view, "elm,type,segment,middle", "elm");
+
+        //Set the segment state
+        if (wd->selected_item == it)
+          {
+             edje_object_signal_emit(it->base.view, "elm,state,segment,selected", "elm");
+             if (it->label) elm_object_style_set(it->label, "segment_selected");
+          }
+        else
+          edje_object_signal_emit(it->base.view, "elm,state,segment,normal", "elm");
+
+        if (elm_widget_disabled_get(wd->obj))
+           {
+              edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
+              if (it->label) elm_object_style_set(it->label, "segment_disabled");
+           }
+
+        _swallow_item_objects(it);
+
+        index++;
      }
 }
 
 static Elm_Segment_Item *
-_item_find(Evas_Object *obj, unsigned int index)
+_item_find(const Evas_Object *obj, int index)
 {
+   Widget_Data *wd;
    Elm_Segment_Item *it;
-   Eina_List *l;
-   int i = 0;
-   Widget_Data *wd = elm_widget_data_get(obj);
+
+   wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
+   it = eina_list_nth(wd->seg_items, index);
+   return it;
+}
+
+static Elm_Segment_Item*
+_item_new(Evas_Object *obj, Evas_Object *icon, const char *label )
+{
+   Elm_Segment_Item *it;
+   Widget_Data *wd;
+
+   wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+
+   it = elm_widget_item_new(obj, Elm_Segment_Item);
+   if (!it) return NULL;
+   elm_widget_item_data_set(it, wd);
+
+   it->base.view = edje_object_add(evas_object_evas_get(obj));
+   edje_object_scale_set(it->base.view, elm_widget_scale_get(it->base.view) *_elm_config->scale);
+   evas_object_smart_member_add(it->base.view, obj);
+   elm_widget_sub_object_add(obj, it->base.view);
+   _elm_theme_object_set(obj, it->base.view, "segment_control", "item", elm_object_style_get(obj));
+
+   if (label)
      {
-        if (i == index) return it;
-       i++;
+        it->label = elm_label_add(obj);
+        elm_widget_sub_object_add(it->base.view, it->label);
+        elm_object_style_set(it->label, "segment_normal");
+        elm_label_label_set(it->label, label);
+        elm_label_ellipsis_set(it->label, EINA_TRUE);
+        evas_object_show(it->label);
      }
-     return NULL;
+
+   it->icon = icon;
+   if (it->icon) elm_widget_sub_object_add(it->base.view, it->icon);
+   evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it);
+   evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it);
+   evas_object_show(it->base.view);
+
+   return it;
 }
 
 /**
- * Add a new segmentcontrol to the parent
- * @param parent The parent object
+ * Create new SegmentControl.
+ * @param [in] parent The parent object
  * @return The new object or NULL if it cannot be created
  *
  * @ingroup SegmentControl SegmentControl
@@ -728,505 +480,474 @@ elm_segment_control_add(Evas_Object *parent)
    Evas *e;
    Widget_Data *wd;
 
-   const char *deffont, *maxheight, *wpad, *hpad;
+   EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
 
    wd = ELM_NEW(Widget_Data);
    e = evas_object_evas_get(parent);
-   if(!e) return NULL;
+   if (!e) return NULL;
    obj = elm_widget_add(e);
-   elm_widget_type_set(obj, "segmented-control");
+   ELM_SET_WIDTYPE(widtype, "segment_control");
+   elm_widget_type_set(obj, "segment_control");
    elm_widget_sub_object_add(parent, obj);
    elm_widget_data_set(obj, wd);
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
+   elm_widget_disable_hook_set(obj, _disable_hook);
 
-   wd->base = edje_object_add(e);
-   _elm_theme_object_set(obj, wd->base, "segmented-control", "base", "default");
-   elm_widget_resize_object_set(obj, wd->base);
-   wd->box = evas_object_box_add(e);
-   evas_object_box_layout_set(wd->box, _layout, wd, NULL);
-   elm_widget_sub_object_add(obj, wd->box);
-   edje_object_part_swallow(wd->base, "elm.swallow.content", wd->box);
-   evas_object_show(wd->box);
-
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _segment_resizing, obj);
-   wd->id = 0;
-   wd->del_index = -1;
-   wd->insert_index = -1;
-   wd->cur_seg_id = -1;
-
-   deffont = edje_object_data_get(wd->base, "default_font_size");
-   if (deffont) wd->cur_fontsize = atoi(deffont);
-   else wd->cur_fontsize = 1;
-
-   maxheight = edje_object_data_get(wd->base, "max_height");
-   if (maxheight) wd->max_height = atoi(maxheight);
-   else wd->max_height = 1;
+#if 0
+   /* TODO Can focus stay on Evas_Object which is not a elm_widget ?? */
+   elm_widget_focus_next_hook_set(obj, _focus_next_hook);
+#endif
 
-   wpad = edje_object_data_get(wd->base, "w_pad");
-   if (wpad) wd->w_pad = atoi(wpad);
-   else wd->w_pad = 1;
+   wd->obj = obj;
 
-   hpad = edje_object_data_get(wd->base, "h_pad");
-   if (hpad) wd->h_pad = atoi(hpad);
-   else wd->h_pad = 1;
+   wd->base = edje_object_add(e);
+   edje_object_scale_set(wd->base, elm_widget_scale_get(wd->base) *_elm_config->scale);
+   _elm_theme_object_set(obj, wd->base, "segment_control", "base", "default");
+   elm_widget_resize_object_set(obj, wd->base);
 
-   _color_value_get((Evas_Object *)wd);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_move_resize, obj);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_move_resize, obj);
+   _sizing_eval(obj);
 
    return obj;
 }
 
+/**
+ * Add new segment item to SegmentControl.
+ * @param [in] obj The SegmentControl object
+ * @param [in] icon Any Objects like icon, Label, layout etc
+ * @param [in] label The label for added segment item. Note that, NULL is different from empty string "".
+ * @return The new segment item or NULL if it cannot be created
+ *
+ * @ingroup SegmentControl SegmentControl
+ */
 EAPI Elm_Segment_Item *
-elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate)
+elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon,
+                             const char *label)
 {
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Elm_Segment_Item *it;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd) return NULL;
-
-   it = _item_new(obj, label, icon);
-   if(!it) return NULL;
-
-   wd->seg_ctrl = eina_list_append(wd->seg_ctrl, it);
-   wd->id = eina_list_count(wd->seg_ctrl);
-   
-   evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it);
-   evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it);
-   evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE, _segment_item_resizing, it);
-   wd->insert_index = -1;
-   wd->del_index = -1;
-   _refresh_segment_ids(obj);
-
-   if(animate && it->segment_id && wd->ani_it == NULL)
-     {
-        evas_object_resize(it->base, 1, wd->height);
-       wd->ani_it = it;
-       wd->ani = ecore_animator_add( _animator_animate_add_cb, obj );
-     }
-   else
-   {
-     _state_value_set(obj);
-     _update_list(obj);
-   }
-   evas_object_show( it->base);
+   Widget_Data *wd;
 
-   evas_object_box_append(wd->box, it->base);
-   evas_object_smart_calculate(wd->box);
+   wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+
+   it = _item_new(obj, icon, label);
+   if (!it) return NULL;
+
+   wd->seg_items = eina_list_append(wd->seg_items, it);
+   _update_list(wd);
 
    return it;
 }
 
 /**
- * Add a new segment item to segmentcontrol
- * @param obj The SegmentControl object
- * @param icon The icon object for added segment item
- * @param label The label for added segment item
- * @param animate If EINA_TRUE the action be animated with sliding effects default EINA_FALSE.
+ * Insert a new segment item to SegmentControl.
+ * @param [in] obj The SegmentControl object
+ * @param [in] icon Any Objects like icon, Label, layout etc
+ * @param [in] label The label for added segment item. Note that, NULL is different from empty string "".
+ * @param [in] index Segment item location. Value should be between 0 and
+ *              Existing total item count( @see elm_segment_control_item_count_get() )
  * @return The new segment item or NULL if it cannot be created
  *
  * @ingroup SegmentControl SegmentControl
  */
 EAPI Elm_Segment_Item *
-elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate)
-{
-   Elm_Segment_Item * it;
-   it = elm_segment_control_item_add(obj, icon, label, animate);
-\r
-    return it;\r
-}
-
-EAPI Elm_Segment_Item *
-elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate)
+elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon,
+                                   const char *label, int index)
 {
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Elm_Segment_Item *it, *it_rel;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd) return NULL;
+   Widget_Data *wd;
 
-   it = _item_new(obj, label, icon);
-   it_rel = _item_find(obj, index);
-   if (!it_rel)
-     {
-        wd->seg_ctrl = eina_list_append(wd->seg_ctrl, it);
-     }
-   else
-     {
-        if (!it) return NULL;
-       wd->seg_ctrl = eina_list_prepend_relative(wd->seg_ctrl, it, it_rel);
-     }
-   evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it);
-   evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it);
-   evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE, _segment_item_resizing, it);
-   wd->insert_index = index;
-   wd->id = eina_list_count(wd->seg_ctrl);
-   _refresh_segment_ids(obj);
-
-   if(animate && it->segment_id && wd->ani_it == NULL)
-     {
-        wd->ani_it = it;
-       evas_object_resize(it->base, 1, wd->height);
-       wd->ani = ecore_animator_add( _animator_animate_add_cb, obj );
-     }
-   else
-   {
-     _state_value_set(obj);
-     _update_list(obj);
-   }
+   wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   if (index < 0) index = 0;
 
-   evas_object_show( it->base);
+   it = _item_new(obj, icon, label);
+   if (!it) return NULL;
 
-   if(index >= wd->id-1)
-     {
-        evas_object_box_append(wd->box,  it->base);
-     }
+   it_rel = _item_find(obj, index);
+   if (it_rel)
+     wd->seg_items = eina_list_prepend_relative(wd->seg_items, it, it_rel);
    else
-     {
-        evas_object_box_insert_at(wd->box,  it->base, index);
-     }
-
-   evas_object_smart_calculate(wd->box);
+     wd->seg_items = eina_list_append(wd->seg_items, it);
 
-   return it ;
+   _update_list(wd);
+   return it;
 }
+
 /**
- * Insert a new segment item to segmentcontrol
- * @param obj The SegmentControl object
- * @param icon The icon object for added segment item
- * @param label The label for added segment item
- * @param index The position at which segment item to be inserted
- * @param animate If 1EINA_TRUE the action be animated with sliding effects default EINA_FALSE.
- * @return The new segment item or NULL if it cannot be created
+ * Delete a segment item from SegmentControl
+ * @param [in] obj The SegmentControl object
+ * @param [in] it The segment item to be deleted
  *
  * @ingroup SegmentControl SegmentControl
  */
 EAPI void
-elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate)
+elm_segment_control_item_del(Elm_Segment_Item *it)
 {
-   Elm_Segment_Item *it;
-   it = elm_segment_control_item_insert_at(obj, icon, label, index, animate);
-
-   return;
-}
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   Widget_Data *wd;
 
-EAPI void
-elm_segment_control_item_del(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate)
-{
-   Elm_Segment_Item *it;
-   Widget_Data *wd = elm_widget_data_get(obj);
+   wd = elm_widget_item_data_get(it);
    if(!wd) return;
 
-
-   it = item;
-   if(!it) return;
-
-   wd->del_index = it->segment_id;
-   if(animate && it->segment_id && wd->ani_it == NULL)
-     {
-        it->delete_me = EINA_TRUE;
-       wd->ani_it = it;
-       wd->ani = ecore_animator_add( _animator_animate_del_cb, obj );
-     }
-   else
-     {
-        evas_object_box_remove(wd->box, it->base);
-       evas_object_smart_calculate(wd->box);
-
-       _item_free(obj, it);
-       _refresh_segment_ids(obj);
-       _state_value_set(obj);
-     }
-   wd->id = eina_list_count(wd->seg_ctrl);
-   return;
+   _item_free(it);
+   _update_list(wd);
 }
 
 /**
- * Delete a segment item to segmentcontrol
- * @param obj The SegmentControl object
- * @param item The  segment item to be deleted
- * @param animate If EINA_TRUE the action be animated with sliding effects default EINA_FALSE.
+ * Delete a segment item of given index from SegmentControl
+ * @param [in] obj The SegmentControl object
+ * @param [in] index The position at which segment item to be deleted
  *
  * @ingroup SegmentControl SegmentControl
  */
 EAPI void
-elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate)
+elm_segment_control_item_del_at(Evas_Object *obj, int index)
 {
-   elm_segment_control_item_del(obj, item, animate);
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Elm_Segment_Item *it;
+   Widget_Data *wd;
 
-   return;
+   wd = elm_widget_data_get(obj);
+   if (!wd) return;
+
+   it = _item_find(obj, index);
+   if (!it) return;
+   _item_free(it);
+   _update_list(wd);
 }
 
-EAPI void
-elm_segment_control_item_del_at(Evas_Object *obj,  unsigned int index, Eina_Bool animate)
+/**
+ * Get the label of a segment item.
+ * @param [in] obj The SegmentControl object
+ * @param [in] index The index of the segment item
+ * @return The label of the segment item
+ *
+ * @ingroup SegmentControl SegmentControl
+ */
+EAPI const char*
+elm_segment_control_item_label_get(Evas_Object *obj, int index)
 {
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Elm_Segment_Item *it;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd) return;
 
    it = _item_find(obj, index);
+   if (it && it->label) return elm_label_label_get(it->label);
 
-   if(!it) return;
-
-   wd->del_index = index;
-   if(animate && it->segment_id)
-     {
-        if(wd->ani_it == NULL)
-       {
-          wd->ani_it = it;
-          it->delete_me = EINA_TRUE;
-          wd->ani = ecore_animator_add( _animator_animate_del_cb, obj );
-       }
-     }
-   else
-     {
-        evas_object_box_remove(wd->box, it->base);
-       evas_object_smart_calculate(wd->box);
-       _item_free(obj, it);
-       _refresh_segment_ids(obj);
-       _state_value_set(obj);
-     }
-   wd->id = eina_list_count(wd->seg_ctrl);
-   return;
+   return NULL;
 }
 
 /**
- * Delete a segment item of given index to segmentcontrol
- * @param obj The SegmentControl object
- * @param index The position at which segment item to be deleted
- * @param animate If EINA_TRUE the action be animated with sliding effects default EINA_FALSE.
+ * Set the label of a segment item.
+ * @param [in] it The SegmentControl Item
+ * @param [in] label New label text.
  *
  * @ingroup SegmentControl SegmentControl
  */
 EAPI void
-elm_segment_control_delete_segment_at(Evas_Object *obj,  unsigned int index, Eina_Bool animate)
+elm_segment_control_item_label_set(Elm_Segment_Item* it, const char* label)
 {
-   elm_segment_control_item_del_at( obj, index, animate);
-
-   return;
-}
-
-
-EAPI const char *
-elm_segment_control_item_label_get(Evas_Object *obj, unsigned int index)
-{
-   Elm_Segment_Item *it_rel;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd) return NULL;
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   Widget_Data *wd;
 
-   it_rel = _item_find(obj, index);
+   wd = elm_widget_item_data_get(it);
+   if (!wd) return;
 
-   if(it_rel) return it_rel->label;
+   if (!label && !it->label) return; //No label, return
+   if (label && !it->label) // Create Label Object
+     {
+        it->label = elm_label_add(it->base.view);
+        elm_widget_sub_object_add(it->base.view, it->label);
+        elm_label_label_set(it->label, label);
+        elm_label_ellipsis_set(it->label, EINA_TRUE);
+        evas_object_show(it->label);
+        if(wd->selected_item == it )
+          elm_object_style_set(it->label, "segment_selected");
+        else
+          elm_object_style_set(it->label, "segment_normal");
+     }
+   else if (!label && it->label) // Delete Label Object
+     {
+        evas_object_del(it->label);
+        it->label = NULL;
+     }
+   else // Update the text
+     elm_label_label_set(it->label, label);
 
-   return NULL;
+   _swallow_item_objects( it );
 }
 
 /**
- * Get the label of a segment item of segmentcontrol
- * @param obj The SegmentControl object
- * @param index The index of the segment item
- * @return The label of the segment item
+ * Get the icon of a segment item of SegmentControl
+ * @param [in] obj The SegmentControl object
+ * @param [in] index The index of the segment item
+ * @return The icon object.
  *
  * @ingroup SegmentControl SegmentControl
  */
-EAPI const char *
-elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index)
-{
-   const char *label;
-   label = elm_segment_control_item_label_get( obj, index);
-  
-   return label;
-}
-
 EAPI Evas_Object *
-elm_segment_control_item_icon_get(Evas_Object *obj, unsigned int index)
+elm_segment_control_item_icon_get(const Evas_Object *obj, int index)
 {
-   Elm_Segment_Item *seg_rel;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd) return NULL;
-
-   seg_rel = _item_find(obj, index);
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Elm_Segment_Item *it;
 
-   if(seg_rel) return seg_rel->icon;
+   it = _item_find(obj, index);
+   if (it) return it->icon;
 
    return NULL;
 }
 
 /**
- * Get the icon of a segment item of segmentcontrol
- * @param obj The SegmentControl object
- * @param index The index of the segment item
- * @return The icon object or NULL if it is not found.
+ * Set the Icon to the segment item
+ * @param [in] it The SegmentControl Item
+ * @param [in] icon Objects like Layout, Icon, Label etc...
  *
  * @ingroup SegmentControl SegmentControl
  */
-EAPI Evas_Object *
-elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index)
-{
-   Evas_Object *icon;
-   icon = elm_segment_control_item_icon_get( obj, index);
-
-   return icon;
-}
-
-EAPI Elm_Segment_Item *
-elm_segment_control_item_selected_get(const Evas_Object *obj)
+EAPI void
+elm_segment_control_item_icon_set(Elm_Segment_Item *it, Evas_Object *icon)
 {
-   Elm_Segment_Item *it;
-   Eina_List *l;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd || !wd->seg_ctrl) return NULL;
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
 
-   EINA_LIST_FOREACH(wd->seg_ctrl, l, it)
+   //Remove the existing icon
+   if (it->icon)
      {
-        if(it->segment_id == wd->cur_seg_id)
-          return it;
+        edje_object_part_unswallow(it->base.view, it->icon);
+        evas_object_del(it->icon);
+        it->icon = NULL;
      }
-    return NULL;
- }
+
+   it->icon = icon;
+   if (it->icon) elm_widget_sub_object_add(it->base.view, it->icon);
+   _swallow_item_objects( it );
+}
 
 /**
- * Get the currently selected segment item of segmentcontrol
- * @param obj The SegmentControl object
- * @param value The Selected Segment id.
- * @return The selected Segment item
+ * Get the Segment items count from SegmentControl
+ * @param [in] obj The SegmentControl object
+ * @return Segment items count.
  *
  * @ingroup SegmentControl SegmentControl
  */
-EAPI Elm_Segment_Item *
-elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value)
-{
-   Elm_Segment_Item *it;
-   it = elm_segment_control_item_selected_get(obj);
-   if(!it) return NULL;
-      *value = it->segment_id;
-   return it;
- }
-
-
 EAPI int
-elm_segment_control_item_count_get(Evas_Object *obj)
+elm_segment_control_item_count_get(const Evas_Object *obj)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if(!wd) return 0;
+   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   Widget_Data *wd;
 
-   return wd->id;
+   wd = elm_widget_data_get(obj);
+   if (!wd) return 0;
+
+   return eina_list_count(wd->seg_items);
 }
 
 /**
- * Get the count of segments of segmentcontrol
- * @param obj The SegmentControl object
- * @return The count of Segment items
+ * Get the base object of segment item.
+ * @param [in] it The Segment item
+ * @return obj The base object of the segment item.
  *
  * @ingroup SegmentControl SegmentControl
  */
-EAPI int
-elm_segment_control_get_segment_count(Evas_Object *obj)
+EAPI Evas_Object*
+elm_segment_control_item_object_get(const Elm_Segment_Item *it)
 {
-   int id;
-   id = elm_segment_control_item_count_get( obj);
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
 
-   return id;
+   return it->base.view;
 }
 
 /**
- * Get the base object of segment item in segmentcontrol
- * @param it The Segment item
- * @return obj The base object of the segment item.
+ * Get the selected segment item in the SegmentControl
+ * @param [in] obj The SegmentControl object
+ * @return Selected Segment Item. NULL if none of segment item is selected.
  *
  * @ingroup SegmentControl SegmentControl
  */
-EAPI Evas_Object *
-elm_segment_control_item_object_get(Elm_Segment_Item *it)
+EAPI Elm_Segment_Item*
+elm_segment_control_item_selected_get(const Evas_Object *obj)
 {
-   if (!it) return NULL;
-   
-   return it->base;
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd;
+
+   wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+
+   return wd->selected_item;
 }
 
 /**
- * Select/unselect a particular segment item of segmentcontrol
- * @param item The Segment item that is to be selected or unselected.
- * @param select If 1 the segment item is selected and if 0 it will be unselected.
+ * Select/unselect a particular segment item of SegmentControl
+ * @param [in] it The Segment item that is to be selected or unselected.
+ * @param [in] select Passing EINA_TRUE will select the segment item and EINA_FALSE will unselect.
  *
  * @ingroup SegmentControl SegmentControl
  */
 EAPI void
-elm_segment_control_item_selected_set( Elm_Segment_Item *item, Eina_Bool select)
+elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select)
 {
-   if(!item) return;
-   Widget_Data *wd = elm_widget_data_get(item->obj);
-   if(!wd) return;
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   Widget_Data *wd;
 
-   if(select)
+   wd = elm_widget_item_data_get(it);
+   if (!wd) return;
+
+   if (it == wd->selected_item)
      {
-        if(item->segment_id == wd->cur_seg_id && wd->cur_seg_id) return;
-//        item->sel = EINA_TRUE;
-        _signal_segment_on(item);
+        if (select) return;  //already in selected selected state.
+
+        //unselect case
+        _segment_off(it);
      }
-   else if(item->segment_id == wd->cur_seg_id)
-     {
-//        item->sel = EINA_FALSE;
-        wd->cur_seg_id = -1;
-        _signal_segment_off(item);
-     } 
+   else
+     _segment_on(it);
 
    return;
 }
 
 /**
- * Get a particular indexed segment item of segmentcontrol
- * @param obj The Segment control object.
- * @param index The index of the segment item.
- * @return The corresponding Segment item.
+ * Get the Segment Item from the specified Index.
+ * @param [in] obj The Segment Control object.
+ * @param [in] index The index of the segment item.
+ * @return The Segment item.
  *
  * @ingroup SegmentControl SegmentControl
  */
 EAPI Elm_Segment_Item *
-elm_segment_control_item_get_at(Evas_Object *obj, unsigned int index)
+elm_segment_control_item_get(const Evas_Object *obj, int index)
 {
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Elm_Segment_Item *it;
+
    it = _item_find(obj, index);
 
    return it;
 }
-\r
+
 /**
- * Get the index of a Segment item of Segmentcontrol
- * @param item The Segment item.
- * @return The corresponding index of the Segment item.
+ * Get the index of a Segment item in the SegmentControl
+ * @param [in] it The Segment Item.
+ * @return Segment Item index.
  *
  * @ingroup SegmentControl SegmentControl
  */
 EAPI int
-elm_segment_control_item_index_get(Elm_Segment_Item *item)
+elm_segment_control_item_index_get(const Elm_Segment_Item *it)
 {
-   if(!item) return -1;
-   Widget_Data *wd = elm_widget_data_get(item->obj);
-   if(!wd) return -1;
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, -1);
 
-   return item->segment_id;
+   return it->seg_index;
+}
+
+//////////////////////////////////  BEGIN  //////////////////////////////////////////////
+/////////////////////////// OLD SLP APIs - TO BE DEPRECATED /////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////
+
+EAPI int
+elm_segment_control_get_segment_count(Evas_Object *obj)
+{
+   fprintf(stderr, "=============================> Warning!!! <========================\n");
+   fprintf(stderr, "==> elm_segment_control_get_segment_count() is deprecated. <=======\n");
+   fprintf(stderr, "===> Please use elm_segment_control_item_count_get() instead. <====\n");
+   fprintf(stderr, "===================================================================\n");
+   return elm_segment_control_item_count_get(obj);
+}
+
+EAPI Elm_Segment_Item *
+elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value)
+{
+   Elm_Segment_Item *it;
+   it = elm_segment_control_item_selected_get(obj);
+   if (!it) return NULL;
+   *value = it->seg_index;
+
+   fprintf(stderr, "=============================> Warning!!! <===========================\n");
+   fprintf(stderr, "==> elm_segment_control_selected_segment_get() is deprecated. <=======\n");
+   fprintf(stderr, "===> Please use elm_segment_control_item_selected_get() instead. <====\n");
+   fprintf(stderr, "======================================================================\n");
+   return it;
 }
 
-/**
- * Set The Label widget to a Segment item of Segmentcontrol
- * @param item The Segment item.
- * @param label The Label.
- * @return Evas_Object The Label widget.
- *
- * @ingroup SegmentControl SegmentControl
- */
 EAPI Evas_Object *
-elm_segment_control_item_label_object_set(Elm_Segment_Item *item, char *label)
+elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index)
 {
-   if(!item) return NULL;
-   Widget_Data *wd = elm_widget_data_get(item->obj);
-   if(!wd) return NULL;
-   if(!label) return NULL;
-
-   item->label_wd = elm_label_add(item->obj);
-   elm_object_style_set(item->label_wd, "segment");
-   elm_label_label_set(item->label_wd, label);
-   elm_label_text_align_set(item->label_wd, "middle");
-   elm_label_ellipsis_set(item->label_wd, 1);
-   eina_stringshare_replace(&item->label, label);
-
-   return item->label_wd;
+   fprintf(stderr, "=============================> Warning!!! <==========================\n");
+   fprintf(stderr, "==> elm_segment_control_get_segment_icon_at() is deprecated. <=======\n");
+   fprintf(stderr, "=====> Please use elm_segment_control_item_icon_get() instead. <=====\n");
+   fprintf(stderr, "=====================================================================\n");
+   return elm_segment_control_item_icon_get(obj, index);
 }
 
+EAPI const char *
+elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index)
+{
+   fprintf(stderr, "=============================> Warning!!! <===========================\n");
+   fprintf(stderr, "==> elm_segment_control_get_segment_label_at() is deprecated. <=======\n");
+   fprintf(stderr, "=====> Please use elm_segment_control_item_label_get() instead. <=====\n");
+   fprintf(stderr, "======================================================================\n");
+   return elm_segment_control_item_label_get(obj, index);
+}
+
+EAPI void
+elm_segment_control_delete_segment_at(Evas_Object *obj, unsigned int index,
+                                      Eina_Bool animate)
+{
+   fprintf(stderr, "=============================> Warning!!! <========================\n");
+   fprintf(stderr, "==> elm_segment_control_delete_segment_at() is deprecated. <=======\n");
+   fprintf(stderr, "=====> Please use elm_segment_control_item_del_at() instead. <=====\n");
+   fprintf(stderr, "===================================================================\n");
+   elm_segment_control_item_del_at(obj, index);
+}
+
+EAPI void
+elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item,
+                                   Eina_Bool animate)
+{
+   fprintf(stderr, "=============================> Warning!!! <=====================\n");
+   fprintf(stderr, "==> elm_segment_control_delete_segment() is deprecated. <=======\n");
+   fprintf(stderr, "=====> Please use elm_segment_control_item_del() instead. <=====\n");
+   fprintf(stderr, "================================================================\n");
+   elm_segment_control_item_del(item);
+}
+
+EAPI void
+elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon,
+                                      const char *label, unsigned int index,
+                                      Eina_Bool animate)
+{
+   fprintf(stderr, "=============================> Warning!!! <===========================\n");
+   fprintf(stderr, "==> elm_segment_control_insert_segment_at() is deprecated. <==========\n");
+   fprintf(stderr, "=====> Please use elm_segment_control_item_insert_at() instead. <=====\n");
+   fprintf(stderr, "======================================================================\n");
+   elm_segment_control_item_insert_at(obj, icon, label, index);
+}
+
+EAPI Elm_Segment_Item *
+elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon,
+                                const char *label, Eina_Bool animate)
+{
+   fprintf(stderr, "=============================> Warning!!! <=====================\n");
+   fprintf(stderr, "==> elm_segment_control_add_segment() is deprecated. <==========\n");
+   fprintf(stderr, "=====> Please use elm_segment_control_item_add() instead. <=====\n");
+   fprintf(stderr, "================================================================\n");
+   return elm_segment_control_item_add(obj, icon, label);
+}
+
+EAPI Evas_Object *
+elm_segment_control_item_label_object_set(Elm_Segment_Item *item, char *label)
+{
+   fprintf(stderr, "=============================> Warning!!! <===============================\n");
+   fprintf(stderr, "==> elm_segment_control_item_label_object_set() is deprecated. <==========\n");
+   fprintf(stderr, "=====> Please use elm_segment_control_item_label_set() instead. <=========\n");
+   fprintf(stderr, "==========================================================================\n");
+   elm_segment_control_item_label_set(item, label);
+   if (item) return item->label;
+   else return NULL;
+}
+/////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////// OLD SLP APIs - TO BE DEPRECATED /////////////////////////////
+///////////////////////////////////  END ////////////////////////////////////////////////
+