Elementary migration revision 69448
[framework/uifw/elementary.git] / src / bin / test_list.c
index fcfe7de..7ce4c7f 100644 (file)
@@ -1,8 +1,240 @@
 #include <Elementary.h>
+#include "test.h"
+#include <Elementary_Cursor.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
+struct _api_data
+{
+   unsigned int state;  /* What state we are testing       */
+   void *list;
+};
+typedef struct _api_data api_data;
+
+enum _api_state
+{
+   ITEM_PREPEND,        /* 0 */
+   ITEM_INSERT_BEFORE,  /* 1 */
+   ITEM_INSERT_AFTER,   /* 2 */
+   ITEM_SEPARATOR_SET,  /* 3 */
+   LIST_ITEM_DEL,       /* 4 */
+   SCROLLER_POLICY_SET_ON,
+   SCROLLER_POLICY_SET_OFF, /* Back to AUTO next */
+   TOOLTIP_TEXT_SET,    /* 7 */
+   TOOLTIP_UNSET,       /* 8 */
+   ITEM_CURSOR_SET,     /* 9 */
+   ITEM_CURSOR_STYLE_SET,
+   DISABLED_SET,        /* 11 */
+   MODE_SET_COMPRESS,   /* 12 */
+   MODE_SET_LIMIT,      /* 13 */
+   MODE_SET_EXPAND,     /* 14 */
+   HORIZONTAL_SET,      /* 15 */
+   BOUNCE_SET,          /* 16 */
+   LIST_CLEAR,          /* 17 */
+   API_STATE_LAST
+};
+typedef enum _api_state api_state;
+
+static void
+set_api_state(api_data *api)
+{
+/** HOW TO TEST ************************
+0 ITEM PREPEND
+Scroll to end
+1 INSERT BEFORE
+Scroll to end
+2 INSERT AFTER
+3 INSERT SEPERATOR
+Scroll to end
+4 ITEM DEL
+5 POLICY ON, BOUNCE_SET(TRUE, TRUE)
+6 POLICY OFF
+Scroll to end
+7 TOOLTIP last-item
+8 Cancel tootip
+9 Curosr set on last item
+10 Cursor style set last item
+11 DISABLE last item
+12 MODE COMPRESS
+13 MODE LIMIT
+14 MODE EXPAND
+15 HORIZ SET
+16 VERT MODE, BOUNCE(TRUE, FALSE) try to bounce on Y-axis
+17 List clear
+*** HOW TO TEST ***********************/
+   Evas_Object *li = api->list;
+
+   switch(api->state)
+     { /* Put all api-changes under switch */
+      case ITEM_PREPEND: /* 0 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              elm_list_item_prepend(li, "PREPEND", NULL, NULL, NULL, NULL);
+              elm_list_go(li);
+              elm_list_item_bring_in(eina_list_nth(items, 0));
+           }
+         break;
+
+      case ITEM_INSERT_BEFORE: /* 1 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_list_item_insert_before(li,
+                        eina_list_nth(items, eina_list_count(items)-1),
+                        "1-before-last", NULL, NULL, NULL, NULL);
+                  elm_list_go(li);
+                  elm_list_item_bring_in(eina_list_data_get(eina_list_last(items)));
+                }
+           }
+         break;
+
+      case ITEM_INSERT_AFTER: /* 2 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_list_item_insert_after(li,
+                        eina_list_nth(items, eina_list_count(items)-2),
+                        "insert-after", NULL, NULL, NULL, NULL);
+                  elm_list_go(li);
+                  elm_list_item_bring_in(eina_list_data_get(eina_list_last(items)));
+                }
+           }
+         break;
+
+      case ITEM_SEPARATOR_SET: /* 3 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_list_item_separator_set(eina_list_nth(items, eina_list_count(items)-3), EINA_TRUE);
+                  elm_list_item_bring_in(eina_list_nth(items, eina_list_count(items)-3));
+                  elm_list_go(li);
+                }
+           }
+         break;
+
+      case LIST_ITEM_DEL: /* 4 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_object_item_del(eina_list_data_get(eina_list_last(items)));
+                }
+           }
+         break;
+
+      case SCROLLER_POLICY_SET_ON: /* 5 */
+         elm_list_bounce_set(li, EINA_TRUE, EINA_TRUE);
+         elm_list_scroller_policy_set(li, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON);
+         break;
+
+      case SCROLLER_POLICY_SET_OFF: /* Back to AUTO next (6) */
+         elm_list_scroller_policy_set(li, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+         break;
+
+      case TOOLTIP_TEXT_SET: /* 7 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_object_item_tooltip_text_set(eina_list_data_get(eina_list_last(items)), "Tooltip set from API");
+                }
+              elm_list_scroller_policy_set(li, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_AUTO);
+           }
+         break;
+
+      case TOOLTIP_UNSET: /* 8 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_object_item_tooltip_unset(eina_list_data_get(eina_list_last(items)));
+                }
+           }
+         break;
+
+      case ITEM_CURSOR_SET: /* 9 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_object_item_cursor_set(eina_list_data_get(eina_list_last(items)), ELM_CURSOR_HAND2);
+                }
+           }
+         break;
+
+      case ITEM_CURSOR_STYLE_SET: /* 10 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_object_item_cursor_style_set(eina_list_data_get(eina_list_last(items)), "transparent");
+                }
+           }
+         break;
+
+      case DISABLED_SET: /* 11 */
+           {
+              const Eina_List *items = elm_list_items_get(li);
+              if(eina_list_count(items))
+                {
+                  elm_object_item_disabled_set(eina_list_data_get(eina_list_last(items)), EINA_TRUE);
+                }
+           }
+         break;
+
+      case MODE_SET_COMPRESS: /* 12 */
+         elm_list_mode_set(li, ELM_LIST_COMPRESS);
+         break;
+
+      case MODE_SET_LIMIT: /* 13 */
+         elm_list_mode_set(li, ELM_LIST_LIMIT);
+         break;
+
+      case MODE_SET_EXPAND: /* 14 */
+         elm_list_mode_set(li, ELM_LIST_EXPAND);
+         break;
+
+      case HORIZONTAL_SET: /* 15 */
+         elm_list_mode_set(li, ELM_LIST_SCROLL); /* return to default mode */
+         elm_list_horizontal_set(li, EINA_TRUE);
+         break;
+
+      case BOUNCE_SET: /* 16 */
+         elm_list_horizontal_set(li, EINA_FALSE);
+         elm_list_bounce_set(li, EINA_TRUE, EINA_FALSE);
+         break;
+
+      case LIST_CLEAR: /* 17 */
+         elm_list_clear(li);
+         break;
+
+      case API_STATE_LAST:
+         break;
+
+      default:
+         return;
+     }
+}
+
+static void
+_api_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{  /* Will add here a SWITCH command containing code to modify test-object */
+   /* in accordance a->state value. */
+   api_data *a = data;
+   char str[128];
+
+   printf("clicked event on API Button: api_state=<%d>\n", a->state);
+   set_api_state(a);
+   a->state++;
+   sprintf(str, "Next API function (%u)", a->state);
+   elm_object_text_set(obj, str);
+   elm_object_disabled_set(obj, a->state == API_STATE_LAST);
+}
+
 static void
 my_show_it(void        *data,
            Evas_Object *obj __UNUSED__,
@@ -43,50 +275,67 @@ scroll_right(void        *data __UNUSED__,
    printf("Right edge!\n");
 }
 
+static void
+_cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   free(data);
+}
+
 void
 test_list(void        *data __UNUSED__,
           Evas_Object *obj __UNUSED__,
           void        *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *li, *ic, *ic2, *bx, *tb2, *bt;
+   Evas_Object *win, *li, *ic, *ic2, *bx, *tb2, *bt, *bxx;
    char buf[PATH_MAX];
    Elm_Object_Item *list_it1, *list_it2, *list_it3, *list_it4, *list_it5;
+   api_data *api = calloc(1, sizeof(api_data));
 
-   win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
-   elm_win_title_set(win, "List");
+   win = elm_win_util_standard_add("list", "List");
    elm_win_autodel_set(win, EINA_TRUE);
+   evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
 
-   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);
+   bxx = elm_box_add(win);
+   elm_win_resize_object_add(win, bxx);
+   evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bxx);
 
    li = elm_list_add(win);
-   elm_win_resize_object_add(win, li);
    elm_list_mode_set(li, ELM_LIST_LIMIT);
    evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   api->list = li;
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Next API function");
+   evas_object_smart_callback_add(bt, "clicked", _api_bt_clicked, (void *) api);
+   elm_box_pack_end(bxx, bt);
+   elm_object_disabled_set(bt, api->state == API_STATE_LAST);
+   evas_object_show(bt);
+
+   elm_box_pack_end(bxx, li);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 1, 1);
+   elm_icon_resizable_set(ic, 1, 1);
    list_it1 = elm_list_item_append(li, "Hello", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_scale_set(ic2, 0, 0);
+   elm_icon_resizable_set(ic2, 0, 0);
    list_it2 = elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx = elm_box_add(win);
@@ -95,7 +344,7 @@ test_list(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -103,7 +352,7 @@ test_list(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -111,7 +360,7 @@ test_list(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -195,19 +444,13 @@ test_list_horizontal(void        *data __UNUSED__,
                      Evas_Object *obj __UNUSED__,
                      void        *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *li, *ic, *ic2, *bx, *tb2, *bt;
+   Evas_Object *win, *li, *ic, *ic2, *bx, *tb2, *bt;
    char buf[PATH_MAX];
    Elm_Object_Item *list_it1, *list_it2, *list_it3, *list_it4;
 
-   win = elm_win_add(NULL, "list-horizontal", ELM_WIN_BASIC);
-   elm_win_title_set(win, "List Horizontal");
+   win = elm_win_util_standard_add("list-horizontal", "List Horizontal");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   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);
-
    li = elm_list_add(win);
    elm_list_horizontal_set(li, EINA_TRUE);
    elm_list_mode_set(li, ELM_LIST_LIMIT);
@@ -217,24 +460,24 @@ test_list_horizontal(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 1, 1);
+   elm_icon_resizable_set(ic, 1, 1);
    list_it1 = elm_list_item_append(li, "Hello", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_scale_set(ic2, 0, 0);
+   elm_icon_resizable_set(ic2, 0, 0);
    list_it2 = elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx = elm_box_add(win);
@@ -242,7 +485,7 @@ test_list_horizontal(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -250,7 +493,7 @@ test_list_horizontal(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -375,20 +618,20 @@ test_list2(void        *data __UNUSED__,
    elm_list_item_selected_set(list_it, EINA_TRUE);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_scale_set(ic2, 0, 0);
+   elm_icon_resizable_set(ic2, 0, 0);
    elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx2 = elm_box_add(win);
@@ -397,7 +640,7 @@ test_list2(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx2, ic);
    evas_object_show(ic);
@@ -405,7 +648,7 @@ test_list2(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx2, ic);
    evas_object_show(ic);
@@ -473,18 +716,12 @@ test_list3(void        *data __UNUSED__,
            Evas_Object *obj __UNUSED__,
            void        *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *li, *ic, *ic2, *bx;
+   Evas_Object *win, *li, *ic, *ic2, *bx;
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "list3", ELM_WIN_BASIC);
-   elm_win_title_set(win, "List 3");
+   win = elm_win_util_standard_add("list3", "List 3");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   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);
-
    li = elm_list_add(win);
    elm_win_resize_object_add(win, li);
    evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -492,7 +729,7 @@ test_list3(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    ic2 = elm_button_add(win);
    elm_object_text_set(ic2, "Click me");
@@ -502,7 +739,7 @@ test_list3(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    ic2 = elm_button_add(win);
    elm_object_text_set(ic2, "Click me");
@@ -511,15 +748,15 @@ test_list3(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_scale_set(ic2, 0, 0);
+   elm_icon_resizable_set(ic2, 0, 0);
    elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx = elm_box_add(win);
@@ -528,7 +765,7 @@ test_list3(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -536,7 +773,7 @@ test_list3(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -544,7 +781,7 @@ test_list3(void        *data __UNUSED__,
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -635,20 +872,14 @@ test_list4(void        *data __UNUSED__,
            Evas_Object *obj __UNUSED__,
            void        *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *li, *ic, *ic2, *naviframe;
+   Evas_Object *win, *li, *ic, *ic2, *naviframe;
    static struct Pginfo info = {NULL, NULL};
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "list4", ELM_WIN_BASIC);
-   elm_win_title_set(win, "List 4");
+   win = elm_win_util_standard_add("list4", "List 4");
    elm_win_autodel_set(win, EINA_TRUE);
    info.win = win;
 
-   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);
-
    naviframe = elm_naviframe_add(win);
    elm_win_resize_object_add(win, naviframe);
    evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -674,7 +905,7 @@ test_list4(void        *data __UNUSED__,
                            "conceptalbums The Dark Side of the Moon, Wish You Were Here, Animals, and The Wall.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/mystrale.jpg", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    elm_list_item_append(li, "Pink Floyd", ic, NULL, NULL, &pf_data);
 
@@ -691,7 +922,7 @@ test_list4(void        *data __UNUSED__,
                            "their first album going multi-platinum globally.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/mystrale_2.jpg", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    elm_list_item_append(li, "Dire Straits", ic, NULL, NULL, &ds_data);
 
@@ -703,7 +934,7 @@ test_list4(void        *data __UNUSED__,
                            "perform at stadium-sized venues.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_17.png", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 1, 1);
+   elm_icon_resizable_set(ic, 1, 1);
    elm_icon_file_set(ic, buf, NULL);
    elm_list_item_append(li, "Uriah Heep", ic, NULL, NULL, &uh_data);
 
@@ -715,11 +946,11 @@ test_list4(void        *data __UNUSED__,
                           "two weeks before the group's first United States tour.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_21.png", elm_app_data_dir_get());
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_scale_set(ic2, 0, 0);
+   elm_icon_resizable_set(ic2, 0, 0);
    elm_list_item_append(li, "Rush", ic, ic2, NULL, &r_data);
 
    elm_list_go(li);
@@ -766,19 +997,13 @@ test_list5(void        *data __UNUSED__,
            Evas_Object *obj __UNUSED__,
            void        *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *li;
+   Evas_Object *win, *li;
    static struct list5_data_cb info;
 
-   win = elm_win_add(NULL, "list5", ELM_WIN_BASIC);
-   elm_win_title_set(win, "List 5");
+   win = elm_win_util_standard_add("list5", "List 5");
    elm_win_autodel_set(win, EINA_TRUE);
    info.win = win;
 
-   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);
-
    li = elm_list_add(win);
    evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_list_mode_set(li, ELM_LIST_COMPRESS);