From 8df2bb821dc76d4cd1a9d8a1dc9b81504c1a8352 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 29 Jun 2011 09:11:48 +0000 Subject: [PATCH] Elm frame: Fix the tests to use the new elm_object_text_set/get API. SVN revision: 60806 --- legacy/elementary/src/bin/config.c | 20 +++++++++---------- legacy/elementary/src/bin/test.c | 2 +- .../elementary/src/bin/test_colorselector.c | 4 ++-- legacy/elementary/src/bin/test_flip.c | 4 ++-- legacy/elementary/src/bin/test_focus.c | 2 +- legacy/elementary/src/bin/test_genlist.c | 4 ++-- legacy/elementary/src/bin/test_scaling.c | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/legacy/elementary/src/bin/config.c b/legacy/elementary/src/bin/config.c index 8a103e4c20..dfc5de771e 100644 --- a/legacy/elementary/src/bin/config.c +++ b/legacy/elementary/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/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index 05b25807eb..c29324f620 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/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/legacy/elementary/src/bin/test_colorselector.c b/legacy/elementary/src/bin/test_colorselector.c index 083370338f..553cb79d3a 100644 --- a/legacy/elementary/src/bin/test_colorselector.c +++ b/legacy/elementary/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/legacy/elementary/src/bin/test_flip.c b/legacy/elementary/src/bin/test_flip.c index 7e496dbcb7..26ff69ee42 100644 --- a/legacy/elementary/src/bin/test_flip.c +++ b/legacy/elementary/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/legacy/elementary/src/bin/test_focus.c b/legacy/elementary/src/bin/test_focus.c index 7918151e5e..931f729093 100644 --- a/legacy/elementary/src/bin/test_focus.c +++ b/legacy/elementary/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/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index a6f8fda2c5..7f8be433e2 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/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/legacy/elementary/src/bin/test_scaling.c b/legacy/elementary/src/bin/test_scaling.c index 48075e9b29..c8fa6eb337 100644 --- a/legacy/elementary/src/bin/test_scaling.c +++ b/legacy/elementary/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
" @@ -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
" @@ -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
"