elm: change elm_object_content_part_set/get/unset to elm_object_part_content_set...

[framework/uifw/elementary.git] / src / bin / test_pager.c

diff --git a/src/bin/test_pager.c b/src/bin/test_pager.c
index a8a988f..4421e89 100644 (file)
--- a/src/bin/test_pager.c
+++ b/src/bin/test_pager.c
@@ -77,7 +77,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);
    elm_win_title_set(win, "Pager");
    elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
-   elm_win_autodel_set(win, 1);
+   elm_win_autodel_set(win, EINA_TRUE);
    info.win = win;
 
    bg = elm_bg_add(win);
@@ -118,7 +118,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    for (i = 0; i < (sizeof(styles) / sizeof(struct style_tuple)); i++)
      {
         rd = elm_radio_add(win);
-        elm_radio_label_set(rd, styles[i].label);
+        elm_object_text_set(rd, styles[i].label);
         elm_radio_state_value_set(rd, i);
         if (rdg)
           elm_radio_group_add(rd, rdg);
@@ -131,13 +131,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_radio_value_set(rd, 0);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 2");
+   elm_object_text_set(bt, "Flip to 2");
    evas_object_smart_callback_add(bt, "clicked", my_pager_1, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -159,13 +159,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 3");
+   elm_object_text_set(bt, "Flip to 3");
    evas_object_smart_callback_add(bt, "clicked", my_pager_2, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -186,13 +186,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 1");
+   elm_object_text_set(bt, "Flip to 1");
    evas_object_smart_callback_add(bt, "clicked", my_pager_3, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -203,13 +203,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    char buf[4096];
 
    ly = elm_layout_add(win);
-   snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR);
+   snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
    elm_layout_file_set(ly, buf, "test/layout");
    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(ly);
 
    ly2 = elm_layout_add(win);
-   snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR);
+   snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
    elm_layout_file_set(ly2, buf, "layout2");
    evas_object_size_hint_weight_set(ly2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    //elm_win_resize_object_add(win, ly2);
@@ -219,18 +219,18 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 1");
+   elm_object_text_set(bt, "Flip to 1");
    evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info);
-   elm_layout_content_set(ly2, "element1", bt);
+   elm_object_part_content_set(ly2, "element1", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    evas_object_show(bt);
-   elm_layout_content_set(ly2, "element2", bt);
+   elm_object_part_content_set(ly2, "element2", bt);
 
-   elm_layout_content_set(ly, "swallow", ly2);
+   elm_object_part_content_set(ly, "swallow", ly2);
    evas_object_show(ly);
 
    elm_pager_content_push(pg, ly);
@@ -259,13 +259,13 @@ my_pager_push(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
    evas_object_show(lb);
 
    bt = elm_button_add(info->win);
-   elm_button_label_set(bt, "Push a new page");
+   elm_object_text_set(bt, "Push a new page");
    evas_object_smart_callback_add(bt, "clicked", my_pager_push, info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(info->win);
-   elm_button_label_set(bt, "Go back (pop)");
+   elm_object_text_set(bt, "Go back (pop)");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -281,7 +281,7 @@ test_pager_slide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);
    elm_win_title_set(win, "Pager Slide");
    elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
-   elm_win_autodel_set(win, 1);
+   elm_win_autodel_set(win, EINA_TRUE);
    info.win = win;
 
    bg = elm_bg_add(win);
@@ -313,13 +313,13 @@ test_pager_slide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Push a new page");
+   elm_object_text_set(bt, "Push a new page");
    evas_object_smart_callback_add(bt, "clicked", my_pager_push, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Go back (pop)");
+   elm_object_text_set(bt, "Go back (pop)");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);