From f9ee82c97e49be867b45bb6f7d211aff0551d13f Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Thu, 15 Mar 2012 10:28:03 +0000 Subject: [PATCH] modify elm_toggle_XXX to elm_check_XXX SVN revision: 69368 --- .../elementary/src/examples/mapbuf_example.c | 8 ++++--- .../src/examples/toggle_example_01.c | 21 ++++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/legacy/elementary/src/examples/mapbuf_example.c b/legacy/elementary/src/examples/mapbuf_example.c index a6df9cfb63..b5637b6aff 100644 --- a/legacy/elementary/src/examples/mapbuf_example.c +++ b/legacy/elementary/src/examples/mapbuf_example.c @@ -27,7 +27,7 @@ static void _enabled_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *mb = data; - elm_mapbuf_enabled_set(mb, elm_toggle_state_get(obj)); + elm_mapbuf_enabled_set(mb, elm_check_state_get(obj)); } static void @@ -97,9 +97,11 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) elm_box_pack_end(bx, hbx); evas_object_show(hbx); - tg = elm_toggle_add(win); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); + elm_object_part_text_set(tg, "on", "Enabled"); + elm_object_part_text_set(tg, "off", "Disabled"); elm_object_text_set(tg, "Map"); - elm_toggle_states_labels_set(tg, "Enabled", "Disabled"); evas_object_smart_callback_add(tg, "changed", _enabled_cb, mb); elm_box_pack_end(hbx, tg); evas_object_show(tg); diff --git a/legacy/elementary/src/examples/toggle_example_01.c b/legacy/elementary/src/examples/toggle_example_01.c index dae0444391..ab85c8e0dd 100644 --- a/legacy/elementary/src/examples/toggle_example_01.c +++ b/legacy/elementary/src/examples/toggle_example_01.c @@ -32,22 +32,27 @@ elm_main(int argc, char **argv) elm_win_resize_object_add(win, bx); evas_object_show(bx); - toggle = elm_toggle_add(win); + toggle = elm_check_add(win); + elm_object_style_set(toggle, "toggle"); + elm_object_part_text_set(toggle, "on", E_("ON")); + elm_object_part_text_set(toggle, "off", E_("OFF")); elm_object_text_set(toggle, "Toggle 1"); ic = elm_icon_add(win); elm_icon_standard_set(ic, "home"); - elm_toggle_icon_set(toggle, ic); - elm_toggle_state_pointer_set(toggle, &val); + elm_object_part_content_set(toggle, "icon", ic); + elm_check_state_pointer_set(toggle, &val); elm_box_pack_end(bx, toggle); evas_object_size_hint_weight_set(toggle, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(toggle, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(toggle); evas_object_smart_callback_add(toggle, "changed", _cb, NULL); - toggle = elm_toggle_add(win); + toggle = elm_check_add(win); + elm_object_style_set(toggle, "toggle"); + elm_object_part_text_set(toggle, "on", "Enabled"); + elm_object_part_text_set(toggle, "off", "Disabled"); elm_object_text_set(toggle, "Toggle 2"); - elm_toggle_states_labels_set(toggle, "Enabled", "Disabled"); - elm_toggle_state_set(toggle, EINA_TRUE); + elm_check_state_set(toggle, EINA_TRUE); elm_box_pack_end(bx, toggle); evas_object_size_hint_weight_set(toggle, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(toggle, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -71,5 +76,5 @@ _cb(void *data, Evas_Object *obj, void *event_info) static void _cb2(void *data, Evas_Object *obj, void *event_info) { - printf("toggle2's state is now: %s\n", elm_toggle_state_get(obj) ? "true" : "false"); -} \ No newline at end of file + printf("toggle2's state is now: %s\n", elm_check_state_get(obj) ? "true" : "false"); +}