From: Enlightenment S. <no-...@en...> - 2011-07-04 09:18:19
|
Log: Elm Check: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-07-04 02:18:13 -0700 (Mon, 04 Jul 2011) New Revision: 60974 Trac: http://trac.enlightenment.org/e/changeset/60974 Modified: trunk/elementary/src/bin/config.c trunk/elementary/src/bin/test_bg.c trunk/elementary/src/bin/test_check.c trunk/elementary/src/bin/test_fileselector.c trunk/elementary/src/bin/test_gengrid.c trunk/elementary/src/bin/test_launcher.c trunk/elementary/src/bin/test_win_state.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-07-04 09:18:10 UTC (rev 60973) +++ trunk/elementary/src/bin/config.c 2011-07-04 09:18:13 UTC (rev 60974) @@ -1208,7 +1208,7 @@ 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 @@ elm_object_tooltip_text_set(ck, "Set whether scrollers should bounce<br>" "when they reach their viewport's edge<br>" "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 @@ ck = elm_check_add(win); elm_object_tooltip_text_set(ck, "Set whether scrollers should be<br>" "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 @@ 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); Modified: trunk/elementary/src/bin/test_bg.c =================================================================== --- trunk/elementary/src/bin/test_bg.c 2011-07-04 09:18:10 UTC (rev 60973) +++ trunk/elementary/src/bin/test_bg.c 2011-07-04 09:18:13 UTC (rev 60974) @@ -176,7 +176,7 @@ 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); Modified: trunk/elementary/src/bin/test_check.c =================================================================== --- trunk/elementary/src/bin/test_check.c 2011-07-04 09:18:10 UTC (rev 60973) +++ trunk/elementary/src/bin/test_check.c 2011-07-04 09:18:13 UTC (rev 60974) @@ -30,7 +30,7 @@ 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 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test_fileselector.c =================================================================== --- trunk/elementary/src/bin/test_fileselector.c 2011-07-04 09:18:10 UTC (rev 60973) +++ trunk/elementary/src/bin/test_fileselector.c 2011-07-04 09:18:13 UTC (rev 60974) @@ -162,21 +162,21 @@ 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); Modified: trunk/elementary/src/bin/test_gengrid.c =================================================================== --- trunk/elementary/src/bin/test_gengrid.c 2011-07-04 09:18:10 UTC (rev 60973) +++ trunk/elementary/src/bin/test_gengrid.c 2011-07-04 09:18:13 UTC (rev 60974) @@ -348,7 +348,7 @@ 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); Modified: trunk/elementary/src/bin/test_launcher.c =================================================================== --- trunk/elementary/src/bin/test_launcher.c 2011-07-04 09:18:10 UTC (rev 60973) +++ trunk/elementary/src/bin/test_launcher.c 2011-07-04 09:18:13 UTC (rev 60974) @@ -327,7 +327,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test_win_state.c =================================================================== --- trunk/elementary/src/bin/test_win_state.c 2011-07-04 09:18:10 UTC (rev 60973) +++ trunk/elementary/src/bin/test_win_state.c 2011-07-04 09:18:13 UTC (rev 60974) @@ -181,7 +181,7 @@ 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 @@ 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); |