Elm frame: Fix the tests to use the new elm_object_text_set/get API.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@60806 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/config.c b/src/bin/config.c
index 8a103e4..dfc5de7 100644 (file)
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -550,7 +550,7 @@ _status_basic(Evas_Object *win,
 
    fr = elm_frame_add(win);
    evas_object_size_hint_weight_set(fr, 1.0, 1.0);
-   elm_frame_label_set(fr, "Information");
+   elm_object_text_set(fr, "Information");
    elm_box_pack_end(bx0, fr);
    evas_object_show(fr);
 
@@ -571,7 +571,7 @@ _status_config(Evas_Object *win,
    fr = elm_frame_add(win);
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_frame_label_set(fr, "Sizing");
+   elm_object_text_set(fr, "Sizing");
    elm_box_pack_end(bx0, fr);
    evas_object_show(fr);
 
@@ -1246,7 +1246,7 @@ _sample_theme_new(Evas_Object *win)
    evas_object_show(sl);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Frame");
+   elm_object_text_set(fr, "Frame");
    elm_table_pack(base, fr, 0, 4, 2, 1);
    evas_object_size_hint_weight_set(fr, 1.0, 1.0);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1378,7 +1378,7 @@ _status_config_themes(Evas_Object *win,
    evas_object_show(pd);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Preview");
+   elm_object_text_set(fr, "Preview");
    evas_object_size_hint_weight_set(fr, 1.0, 1.0);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_frame_content_set(pd, fr);
@@ -1893,7 +1893,7 @@ _status_config_fonts(Evas_Object *win,
    elm_table_pack(base, rc, 1, 0, 1, 1);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Font Class");
+   elm_object_text_set(fr, "Font Class");
    elm_table_pack(base, fr, 0, 0, 1, 2);
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1910,7 +1910,7 @@ _status_config_fonts(Evas_Object *win,
    _font_classes_list_load(li);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Font");
+   elm_object_text_set(fr, "Font");
    elm_table_pack(base, fr, 1, 0, 1, 2);
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1933,7 +1933,7 @@ _status_config_fonts(Evas_Object *win,
    elm_table_pack(base, rc, 1, 2, 1, 1);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Style");
+   elm_object_text_set(fr, "Style");
    elm_table_pack(base, fr, 0, 2, 1, 1);
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1951,7 +1951,7 @@ _status_config_fonts(Evas_Object *win,
                                   NULL);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Size");
+   elm_object_text_set(fr, "Size");
    elm_table_pack(base, fr, 1, 2, 1, 1);
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -2233,7 +2233,7 @@ _status_config_profiles(Evas_Object *win,
    evas_object_show(fr_bx2);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Available Profiles");
+   elm_object_text_set(fr, "Available Profiles");
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_frame_content_set(fr, fr_bx1);
@@ -2673,7 +2673,7 @@ _status_config_rendering(Evas_Object *win,
    evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Available Engines");
+   elm_object_text_set(fr, "Available Engines");
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, fr);

diff --git a/src/bin/test.c b/src/bin/test.c
index 05b2580..c29324f 100644 (file)
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -244,7 +244,7 @@ my_win_main(char *autorun)
    evas_object_show(bx0);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Information");
+   elm_object_text_set(fr, "Information");
    elm_box_pack_end(bx0, fr);
    evas_object_show(fr);
 

diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c
index 0833703..553cb79 100644 (file)
--- a/src/bin/test_colorselector.c
+++ b/src/bin/test_colorselector.c
@@ -46,7 +46,7 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
    fr = elm_frame_add(win);
    evas_object_size_hint_weight_set(fr, 1.0, 0.5);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_frame_label_set(fr, "Color View");
+   elm_object_text_set(fr, "Color View");
    elm_box_pack_end(bx, fr);
    evas_object_show(fr);
 
@@ -65,7 +65,7 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
    fr = elm_frame_add(win);
    evas_object_size_hint_weight_set(fr, 1.0, 0);
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, 0);
-   elm_frame_label_set(fr, "Color Selector");
+   elm_object_text_set(fr, "Color Selector");
    elm_box_pack_end(bx, fr);
    evas_object_show(fr);
 

diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c
index 7e496db..26ff69e 100644 (file)
--- a/src/bin/test_flip.c
+++ b/src/bin/test_flip.c
@@ -400,7 +400,7 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(fl);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Front");
+   elm_object_text_set(fr, "Front");
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_flip_content_front_set(fl, fr);
@@ -429,7 +429,7 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(o);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Back");
+   elm_object_text_set(fr, "Back");
    evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_flip_content_back_set(fl, fr);

diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index 7918151..931f729 100644 (file)
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -320,7 +320,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
           {
              Evas_Object *fr = elm_frame_add(win);
-             elm_frame_label_set(fr, "Frame");
+             elm_object_text_set(fr, "Frame");
              elm_box_pack_end(bx, fr);
              evas_object_show(fr);
 

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index a6f8fda..7f8be43 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -1717,7 +1717,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bx);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Mode Type");
+   elm_object_text_set(fr, "Mode Type");
    elm_box_pack_end(bx, fr);
    evas_object_show(fr);
 
@@ -1834,7 +1834,7 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    fr = elm_frame_add(win);
 
-   elm_frame_label_set(fr, "Reorder Mode");
+   elm_object_text_set(fr, "Reorder Mode");
    elm_box_pack_end(bx, fr);
    evas_object_show(fr);
 

diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c
index 48075e9..c8fa6eb 100644 (file)
--- a/src/bin/test_scaling.c
+++ b/src/bin/test_scaling.c
@@ -83,7 +83,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    fr = elm_frame_add(win);
    elm_object_scale_set(fr, 0.5);
-   elm_frame_label_set(fr, "Scale: 0.5");
+   elm_object_text_set(fr, "Scale: 0.5");
    lb = elm_label_add(win);
    elm_object_text_set(lb,
                       "Parent frame scale<br>"
@@ -95,7 +95,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(fr);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Scale: 1.0");
+   elm_object_text_set(fr, "Scale: 1.0");
    lb = elm_label_add(win);
    elm_object_text_set(lb,
                       "Parent frame scale<br>"
@@ -108,7 +108,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(fr);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Scale: 2.0");
+   elm_object_text_set(fr, "Scale: 2.0");
    lb = elm_label_add(win);
    elm_object_text_set(lb,
                       "Parent frame scale<br>"