From 246a6bb2f7e331bbfc30197ee13b133da8c31d29 Mon Sep 17 00:00:00 2001 From: tasn Date: Mon, 4 Jul 2011 09:18:13 +0000 Subject: [PATCH] Elm Check: Fix the tests to use the new elm_object_text_set/get API. git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@60974 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/config.c | 8 ++++---- src/bin/test_bg.c | 2 +- src/bin/test_check.c | 8 ++++---- src/bin/test_fileselector.c | 6 +++--- src/bin/test_gengrid.c | 2 +- src/bin/test_launcher.c | 26 +++++++++++++------------- src/bin/test_win_state.c | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/bin/config.c b/src/bin/config.c index 4386edc..ff0d078 100644 --- a/src/bin/config.c +++ b/src/bin/config.c @@ -1208,7 +1208,7 @@ _sample_theme_new(Evas_Object *win) ck = elm_check_add(win); evas_object_size_hint_weight_set(ck, 1.0, 0.0); - elm_check_label_set(ck, "Check"); + elm_object_text_set(ck, "Check"); elm_table_pack(base, ck, 0, 1, 1, 1); evas_object_show(ck); @@ -2369,7 +2369,7 @@ _status_config_scrolling(Evas_Object *win, elm_object_tooltip_text_set(ck, "Set whether scrollers should bounce
" "when they reach their viewport's edge
" "during a scroll"); - elm_check_label_set(ck, "Enable scroll bounce"); + elm_object_text_set(ck, "Enable scroll bounce"); evas_object_data_set(win, "scroll_bounce_check", ck); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); @@ -2408,7 +2408,7 @@ _status_config_scrolling(Evas_Object *win, ck = elm_check_add(win); elm_object_tooltip_text_set(ck, "Set whether scrollers should be
" "draggable from any point in their views"); - elm_check_label_set(ck, "Enable thumb scroll"); + elm_object_text_set(ck, "Enable thumb scroll"); evas_object_data_set(win, "thumbscroll_check", ck); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); @@ -2744,7 +2744,7 @@ _status_config_caches(Evas_Object *win, ck = elm_check_add(win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); - elm_check_label_set(ck, "Enable Flushing"); + elm_object_text_set(ck, "Enable Flushing"); elm_check_state_set(ck, elm_cache_flush_enabled_get()); evas_object_smart_callback_add(ck, "changed", cf_enable, sl); elm_box_pack_end(bx, ck); diff --git a/src/bin/test_bg.c b/src/bin/test_bg.c index f858d4a..0b03126 100644 --- a/src/bin/test_bg.c +++ b/src/bin/test_bg.c @@ -176,7 +176,7 @@ test_bg_options(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ elm_radio_value_set(rdg, ELM_BG_OPTION_SCALE); rd = elm_check_add(win); - elm_check_label_set(rd, "Show Overlay"); + elm_object_text_set(rd, "Show Overlay"); evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL); evas_object_smart_callback_add(rd, "changed", _cb_overlay_changed, o_bg); elm_box_pack_end(hbox, rd); diff --git a/src/bin/test_check.c b/src/bin/test_check.c index 714b2a1..c1a7468 100644 --- a/src/bin/test_check.c +++ b/src/bin/test_check.c @@ -30,7 +30,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info ck = elm_check_add(win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); - elm_check_label_set(ck, "Icon sized to check"); + elm_object_text_set(ck, "Icon sized to check"); elm_check_icon_set(ck, ic); elm_check_state_set(ck, 1); elm_box_pack_end(bx, ck); @@ -42,14 +42,14 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); ck = elm_check_add(win); - elm_check_label_set(ck, "Icon no scale"); + elm_object_text_set(ck, "Icon no scale"); elm_check_icon_set(ck, ic); elm_box_pack_end(bx, ck); evas_object_show(ck); evas_object_show(ic); ck = elm_check_add(win); - elm_check_label_set(ck, "Label Only"); + elm_object_text_set(ck, "Label Only"); elm_box_pack_end(bx, ck); evas_object_show(ck); @@ -60,7 +60,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info ck = elm_check_add(win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); - elm_check_label_set(ck, "Disabled check"); + elm_object_text_set(ck, "Disabled check"); elm_check_icon_set(ck, ic); elm_check_state_set(ck, 1); elm_box_pack_end(bx, ck); diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c index c669c11..ba7b54c 100644 --- a/src/bin/test_fileselector.c +++ b/src/bin/test_fileselector.c @@ -162,21 +162,21 @@ test_fileselector(void *data __UNUSED__, evas_object_show(hbox); bt = elm_check_add(win); - elm_check_label_set(bt, "is save"); + elm_object_text_set(bt, "is save"); elm_check_state_set(bt, elm_fileselector_is_save_get(fs)); evas_object_smart_callback_add(bt, "changed", _is_save_clicked, fs); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_check_add(win); - elm_check_label_set(bt, "folder only"); + elm_object_text_set(bt, "folder only"); elm_check_state_set(bt, elm_fileselector_folder_only_get(fs)); evas_object_smart_callback_add(bt, "changed", _folder_only_clicked, fs); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_check_add(win); - elm_check_label_set(bt, "expandable"); + elm_object_text_set(bt, "expandable"); elm_check_state_set(bt, elm_fileselector_expandable_get(fs)); evas_object_smart_callback_add(bt, "changed", _expandable_clicked, fs); elm_box_pack_end(hbox, bt); diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c index e18a3fd..6f846e0 100644 --- a/src/bin/test_gengrid.c +++ b/src/bin/test_gengrid.c @@ -348,7 +348,7 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_show(bt); ck = elm_check_add(win); - elm_check_label_set(ck, "Horizontal Mode"); + elm_object_text_set(ck, "Horizontal Mode"); evas_object_smart_callback_add(ck, "changed", _horizontal_grid, grid); elm_box_pack_end(hbx, ck); evas_object_show(ck); diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c index e27990d..58af41a 100644 --- a/src/bin/test_launcher.c +++ b/src/bin/test_launcher.c @@ -327,7 +327,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_box_pack_end(bx2, sc); ck = elm_check_add(win); - elm_check_label_set(ck, "Map"); + elm_object_text_set(ck, "Map"); elm_check_state_set(ck, 0); evas_object_smart_callback_add(ck, "changed", mode_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -336,7 +336,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "A"); + elm_object_text_set(ck, "A"); elm_check_state_set(ck, 1); evas_object_smart_callback_add(ck, "changed", alpha_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -345,7 +345,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "Smo"); + elm_object_text_set(ck, "Smo"); elm_check_state_set(ck, 1); evas_object_smart_callback_add(ck, "changed", smooth_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -354,7 +354,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "FS"); + elm_object_text_set(ck, "FS"); elm_check_state_set(ck, 0); evas_object_smart_callback_add(ck, "changed", full_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -451,7 +451,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_win_resize_object_add(win, tb2); ck = elm_check_add(win); - elm_check_label_set(ck, "Map"); + elm_object_text_set(ck, "Map"); elm_check_state_set(ck, 0); evas_object_smart_callback_add(ck, "changed", mode_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -460,7 +460,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "A"); + elm_object_text_set(ck, "A"); elm_check_state_set(ck, 1); evas_object_smart_callback_add(ck, "changed", alpha_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -469,7 +469,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "Smo"); + elm_object_text_set(ck, "Smo"); elm_check_state_set(ck, 1); evas_object_smart_callback_add(ck, "changed", smooth_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -478,7 +478,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "FS"); + elm_object_text_set(ck, "FS"); elm_check_state_set(ck, 0); evas_object_smart_callback_add(ck, "changed", full_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -862,7 +862,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_box_pack_end(bx2, sc); ck = elm_check_add(win); - elm_check_label_set(ck, "Map"); + elm_object_text_set(ck, "Map"); elm_check_state_set(ck, 0); evas_object_smart_callback_add(ck, "changed", l3_mode_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -871,7 +871,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "A"); + elm_object_text_set(ck, "A"); elm_check_state_set(ck, 1); evas_object_smart_callback_add(ck, "changed", l3_alpha_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -880,7 +880,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "Smo"); + elm_object_text_set(ck, "Smo"); elm_check_state_set(ck, 1); evas_object_smart_callback_add(ck, "changed", l3_smooth_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -889,7 +889,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "FS"); + elm_object_text_set(ck, "FS"); elm_check_state_set(ck, 0); evas_object_smart_callback_add(ck, "changed", l3_full_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -898,7 +898,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(ck); ck = elm_check_add(win); - elm_check_label_set(ck, "Hid"); + elm_object_text_set(ck, "Hid"); elm_check_state_set(ck, 0); evas_object_smart_callback_add(ck, "changed", l3_hidden_cb, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/test_win_state.c b/src/bin/test_win_state.c index 97cc347..a64f7dc 100644 --- a/src/bin/test_win_state.c +++ b/src/bin/test_win_state.c @@ -181,7 +181,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(bx2); ck = elm_check_add(win); - elm_check_label_set(ck, "resize"); + elm_object_text_set(ck, "resize"); elm_check_state_set(ck, rotate_with_resize); evas_object_smart_callback_add(ck, "changed", my_ck_38_resize, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -314,7 +314,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ evas_object_show(bx2); ck = elm_check_add(win); - elm_check_label_set(ck, "resize"); + elm_object_text_set(ck, "resize"); elm_check_state_set(ck, rotate_with_resize); evas_object_smart_callback_add(ck, "changed", my_ck_38_resize, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -- 2.7.4