From: seoz Date: Wed, 14 Sep 2011 11:30:21 +0000 (+0000) Subject: elm src/examples: Applied elm API changes. X-Git-Tag: REL_F_I9500_20120323_1~17^2~1797 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32b48c11bae662402924e7fa7dcc112eca64d14b;p=framework%2Fuifw%2Felementary.git elm src/examples: Applied elm API changes. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@63382 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/examples/actionslider_example_01.c b/src/examples/actionslider_example_01.c index 7b377a6..d518436 100644 --- a/src/examples/actionslider_example_01.c +++ b/src/examples/actionslider_example_01.c @@ -62,7 +62,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_size_hint_align_set(as, EVAS_HINT_FILL, 0); elm_actionslider_indicator_pos_set(as, ELM_ACTIONSLIDER_RIGHT); elm_actionslider_magnet_pos_set(as, ELM_ACTIONSLIDER_RIGHT); - elm_actionslider_labels_set(as, "Snooze", NULL, "Stop"); + elm_object_text_part_set(as, "left", "Snooze"); + elm_object_text_part_set(as, "right", "Stop"); elm_actionslider_enabled_pos_set(as, ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT); evas_object_smart_callback_add(as, "pos_changed", @@ -76,7 +77,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_size_hint_align_set(as, EVAS_HINT_FILL, 0); elm_actionslider_indicator_pos_set(as, ELM_ACTIONSLIDER_CENTER); elm_actionslider_magnet_pos_set(as, ELM_ACTIONSLIDER_CENTER); - elm_actionslider_labels_set(as, "Snooze", NULL, "Stop"); + elm_object_text_part_set(as, "left", "Snooze"); + elm_object_text_part_set(as, "right", "Stop"); elm_actionslider_enabled_pos_set(as, ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT); evas_object_smart_callback_add(as, "selected", _pos_selected_cb, NULL); @@ -92,7 +94,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) ELM_ACTIONSLIDER_RIGHT); elm_actionslider_enabled_pos_set(as, ELM_ACTIONSLIDER_CENTER | ELM_ACTIONSLIDER_RIGHT); - elm_actionslider_labels_set(as, NULL, "Accept", "Reject"); + elm_object_text_part_set(as, "center", "Accept"); + elm_object_text_part_set(as, "right", "Reject"); evas_object_smart_callback_add(as, "selected", _pos_selected_cb, NULL); evas_object_show(as); elm_box_pack_end(bx, as); @@ -103,8 +106,9 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_size_hint_align_set(as, EVAS_HINT_FILL, 0); elm_actionslider_indicator_pos_set(as, ELM_ACTIONSLIDER_LEFT); elm_actionslider_magnet_pos_set(as, ELM_ACTIONSLIDER_LEFT); - elm_actionslider_labels_set(as, NULL, "Accept", "Reject"); - elm_actionslider_indicator_label_set(as, "Go"); + elm_object_text_part_set(as, "center", "Accept"); + elm_object_text_part_set(as, "right", "Reject"); + elm_object_text_set(as, "Go"); evas_object_smart_callback_add(as, "pos_changed", _position_change_magnetic_cb, NULL); evas_object_smart_callback_add(as, "selected", _pos_selected_cb, NULL); @@ -117,8 +121,10 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_size_hint_align_set(as, EVAS_HINT_FILL, 0); elm_actionslider_indicator_pos_set(as, ELM_ACTIONSLIDER_LEFT); elm_actionslider_magnet_pos_set(as, ELM_ACTIONSLIDER_ALL); - elm_actionslider_labels_set(as, "Left", "Center", "Right"); - elm_actionslider_indicator_label_set(as, "Go"); + elm_object_text_part_set(as, "left", "Left"); + elm_object_text_part_set(as, "center", "Center"); + elm_object_text_part_set(as, "right", "Right"); + elm_object_text_set(as, "Go"); evas_object_smart_callback_add(as, "selected", _pos_selected_cb, NULL); evas_object_show(as); elm_box_pack_end(bx, as); @@ -128,7 +134,9 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_size_hint_align_set(as, EVAS_HINT_FILL, 0); elm_actionslider_indicator_pos_set(as, ELM_ACTIONSLIDER_CENTER); elm_actionslider_magnet_pos_set(as, ELM_ACTIONSLIDER_CENTER); - elm_actionslider_labels_set(as, "Enable", "Magnet", "Disable"); + elm_object_text_part_set(as, "left", "Enable"); + elm_object_text_part_set(as, "center", "Magnet"); + elm_object_text_part_set(as, "right", "Disable"); evas_object_smart_callback_add(as, "pos_changed", _magnet_enable_disable_cb, NULL); evas_object_smart_callback_add(as, "selected", _pos_selected_cb, NULL); diff --git a/src/examples/anchorblock_example_01.c b/src/examples/anchorblock_example_01.c index ecf7831..a4fb5e9 100644 --- a/src/examples/anchorblock_example_01.c +++ b/src/examples/anchorblock_example_01.c @@ -49,7 +49,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(box); frame = elm_frame_add(win); - elm_frame_label_set(frame, "Anchorblock"); + elm_object_text_set(frame, "Anchorblock"); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(frame); elm_box_pack_end(box, frame); @@ -64,7 +64,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) elm_frame_content_set(frame, o); frame = elm_frame_add(win); - elm_frame_label_set(frame, "Anchorview"); + elm_object_text_set(frame, "Anchorview"); evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(frame); @@ -136,7 +136,7 @@ _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_S p = strchr(info->name, ':'); if (!p) { - elm_button_label_set(btn, "Nothing to see here"); + elm_object_text_set(btn, "Nothing to see here"); evas_object_smart_callback_add(btn, "clicked", btn_end_cb, ao); elm_hover_content_set(info->hover, "middle", btn); return; @@ -146,10 +146,10 @@ _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_S if (!strncmp(info->name, "tel:", 4)) { Evas_Object *o; - elm_button_label_set(btn, "Call"); + elm_object_text_set(btn, "Call"); secondary = elm_button_add(ao); - elm_button_label_set(secondary, "Send SMS"); + elm_object_text_set(secondary, "Send SMS"); evas_object_show(secondary); evas_object_smart_callback_add(secondary, "clicked", btn_end_cb, ao); evas_object_smart_callback_add(secondary, "clicked", _btn_clicked_cb, @@ -159,14 +159,14 @@ _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_S evas_object_show(box); o = elm_button_add(ao); - elm_button_label_set(o, "Add to contacts"); + elm_object_text_set(o, "Add to contacts"); elm_box_pack_end(box, o); evas_object_show(o); evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); evas_object_smart_callback_add(o, "clicked", _btn_clicked_cb, str); o = elm_button_add(ao); - elm_button_label_set(o, "Send MMS"); + elm_object_text_set(o, "Send MMS"); elm_box_pack_end(box, o); evas_object_show(o); evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); @@ -175,10 +175,10 @@ _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_S else if (!strncmp(info->name, "contact:", 8)) { Evas_Object *o; - elm_button_label_set(btn, "Call"); + elm_object_text_set(btn, "Call"); secondary = elm_button_add(ao); - elm_button_label_set(secondary, "Send SMS"); + elm_object_text_set(secondary, "Send SMS"); evas_object_show(secondary); evas_object_smart_callback_add(secondary, "clicked", btn_end_cb, ao); evas_object_smart_callback_add(secondary, "clicked", _btn_clicked_cb, @@ -188,7 +188,7 @@ _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_S evas_object_show(box); o = elm_button_add(ao); - elm_button_label_set(o, "Send MMS"); + elm_object_text_set(o, "Send MMS"); elm_box_pack_end(box, o); evas_object_show(o); evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); @@ -196,10 +196,10 @@ _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_S } else if (!strncmp(info->name, "mailto:", 7)) { - elm_button_label_set(btn, "Send E-Mail"); + elm_object_text_set(btn, "Send E-Mail"); secondary = elm_button_add(ao); - elm_button_label_set(secondary, "Add to contacts"); + elm_object_text_set(secondary, "Add to contacts"); evas_object_show(secondary); evas_object_smart_callback_add(secondary, "clicked", btn_end_cb, ao); evas_object_smart_callback_add(secondary, "clicked", _btn_clicked_cb, @@ -208,20 +208,20 @@ _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_S else if (!strncmp(info->name, "url:", 4)) { Evas_Object *o; - elm_button_label_set(btn, "Launch in browser"); + elm_object_text_set(btn, "Launch in browser"); box = elm_box_add(ao); evas_object_show(box); o = elm_button_add(ao); - elm_button_label_set(o, "Send as mail to..."); + elm_object_text_set(o, "Send as mail to..."); elm_box_pack_end(box, o); evas_object_show(o); evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); evas_object_smart_callback_add(o, "clicked", _btn_clicked_cb, str); o = elm_button_add(ao); - elm_button_label_set(o, "Send as SMS to..."); + elm_object_text_set(o, "Send as SMS to..."); elm_box_pack_end(box, o); evas_object_show(o); evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); diff --git a/src/examples/bg_example_03.c b/src/examples/bg_example_03.c index b64f7f0..ae42c58 100644 --- a/src/examples/bg_example_03.c +++ b/src/examples/bg_example_03.c @@ -99,7 +99,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) rd = elm_radio_add(win); elm_radio_state_value_set(rd, ELM_BG_OPTION_CENTER); - elm_radio_label_set(rd, "Center"); + elm_object_text_set(rd, "Center"); evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL); evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg); elm_box_pack_end(hbox, rd); @@ -109,7 +109,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) rd = elm_radio_add(win); elm_radio_state_value_set(rd, ELM_BG_OPTION_SCALE); elm_radio_group_add(rd, rdg); - elm_radio_label_set(rd, "Scale"); + elm_object_text_set(rd, "Scale"); evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL); evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg); elm_box_pack_end(hbox, rd); @@ -118,7 +118,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) rd = elm_radio_add(win); elm_radio_state_value_set(rd, ELM_BG_OPTION_STRETCH); elm_radio_group_add(rd, rdg); - elm_radio_label_set(rd, "Stretch"); + elm_object_text_set(rd, "Stretch"); evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL); evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg); elm_box_pack_end(hbox, rd); @@ -127,7 +127,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) rd = elm_radio_add(win); elm_radio_state_value_set(rd, ELM_BG_OPTION_TILE); elm_radio_group_add(rd, rdg); - elm_radio_label_set(rd, "Tile"); + elm_object_text_set(rd, "Tile"); evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL); evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg); elm_box_pack_end(hbox, rd); @@ -136,7 +136,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) 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/examples/box_example_02.c b/src/examples/box_example_02.c index bf39047..3e4b3d1 100644 --- a/src/examples/box_example_02.c +++ b/src/examples/box_example_02.c @@ -20,7 +20,7 @@ _add_cb(void *data, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) Transitions_Data *tdata = data; btn = elm_button_add(tdata->box); - elm_button_label_set(btn, "I do nothing"); + elm_object_text_set(btn, "I do nothing"); children = (Eina_List *)elm_box_children_get(tdata->box); if (children) { @@ -102,13 +102,13 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(bx); bt = elm_button_add(win); - elm_button_label_set(bt, "Add"); + elm_object_text_set(bt, "Add"); elm_box_pack_end(bx, bt); evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _add_cb, &tdata); bt = elm_button_add(win); - elm_button_label_set(bt, "Clear"); + elm_object_text_set(bt, "Clear"); elm_box_pack_end(bx, bt); evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _clear_cb, &tdata); @@ -120,7 +120,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(bx); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 1"); + elm_object_text_set(bt, "Button 1"); evas_object_smart_callback_add(bt, "clicked", _unpack_cb, &tdata); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -128,7 +128,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 2"); + elm_object_text_set(bt, "Button 2"); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bt, 1.0, 0.5); evas_object_smart_callback_add(bt, "clicked", _unpack_cb, &tdata); @@ -136,7 +136,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 3"); + elm_object_text_set(bt, "Button 3"); evas_object_smart_callback_add(bt, "clicked", _unpack_cb, &tdata); elm_box_pack_end(bx, bt); evas_object_show(bt); diff --git a/src/examples/bubble_example_01.c b/src/examples/bubble_example_01.c index 80e655a..7f38e41 100644 --- a/src/examples/bubble_example_01.c +++ b/src/examples/bubble_example_01.c @@ -42,7 +42,7 @@ elm_main(int argc, char **argv) bubble = elm_bubble_add(win); elm_bubble_icon_set(bubble, icon); elm_bubble_info_set(bubble, "INFO"); - elm_bubble_label_set(bubble, "LABEL"); + elm_object_text_set(bubble, "LABEL"); elm_bubble_content_set(bubble, label); evas_object_resize(bubble, 300, 100); evas_object_show(bubble); diff --git a/src/examples/button_example_01.c b/src/examples/button_example_01.c index 4ab6676..d430b4e 100644 --- a/src/examples/button_example_01.c +++ b/src/examples/button_example_01.c @@ -130,19 +130,19 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(box2); btn = elm_button_add(win); - elm_button_label_set(btn, "Initial: 0.0"); + elm_object_text_set(btn, "Initial: 0.0"); elm_box_pack_end(box2, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_options_cb, &data); btn = elm_button_add(win); - elm_button_label_set(btn, "Initial: 1.0"); + elm_object_text_set(btn, "Initial: 1.0"); elm_box_pack_end(box2, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_options_cb, &data); btn = elm_button_add(win); - elm_button_label_set(btn, "Initial: 5.0"); + elm_object_text_set(btn, "Initial: 5.0"); elm_box_pack_end(box2, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_options_cb, &data); @@ -154,19 +154,19 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(box2); btn = elm_button_add(win); - elm_button_label_set(btn, "Gap: 0.1"); + elm_object_text_set(btn, "Gap: 0.1"); elm_box_pack_end(box2, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_options_cb, &data); btn = elm_button_add(win); - elm_button_label_set(btn, "Gap: 0.5"); + elm_object_text_set(btn, "Gap: 0.5"); elm_box_pack_end(box2, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_options_cb, &data); btn = elm_button_add(win); - elm_button_label_set(btn, "Gap: 1.0"); + elm_object_text_set(btn, "Gap: 1.0"); elm_box_pack_end(box2, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_options_cb, &data); diff --git a/src/examples/calendar_example_06.c b/src/examples/calendar_example_06.c index 8b3a9f8..7a4cc1e 100644 --- a/src/examples/calendar_example_06.c +++ b/src/examples/calendar_example_06.c @@ -85,7 +85,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) bt = elm_button_add(win); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_button_label_set(bt, "Clear marks"); + elm_object_text_set(bt, "Clear marks"); evas_object_smart_callback_add(bt, "clicked", _btn_clear_cb, cal); elm_box_pack_end(bx, bt); evas_object_show(bt); diff --git a/src/examples/general_funcs_example.c b/src/examples/general_funcs_example.c index b7e509f..283e063 100644 --- a/src/examples/general_funcs_example.c +++ b/src/examples/general_funcs_example.c @@ -110,13 +110,13 @@ elm_main(int argc __UNUSED__, evas_object_show(box); frame = elm_frame_add(win); - elm_frame_label_set(frame, "Button"); + elm_object_text_set(frame, "Button"); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(frame); elm_box_pack_end(box, frame); d.btn = elm_button_add(win); - elm_button_label_set(d.btn, "Click me"); + elm_object_text_set(d.btn, "Click me"); elm_frame_content_set(frame, d.btn); fprintf(stdout, "Elementary's finger size is set to %d pixels\n.", @@ -137,7 +137,7 @@ elm_main(int argc __UNUSED__, check = elm_check_add(win); evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(check, 0.0, 0.0); - elm_check_label_set(check, "Button enabled"); + elm_object_text_set(check, "Button enabled"); elm_check_state_pointer_set(check, &d.btn_enabled); evas_object_smart_callback_add(check, "changed", _btn_enabled_cb, NULL); elm_box_pack_end(box, check); @@ -146,7 +146,7 @@ elm_main(int argc __UNUSED__, b = elm_button_add(win); evas_object_size_hint_weight_set(b, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(b, 0.0, 0.0); - elm_button_label_set(b, "Focus top button"); + elm_object_text_set(b, "Focus top button"); evas_object_smart_callback_add(b, "clicked", _btn_focus_cb, NULL); elm_box_pack_end(box, b); evas_object_show(b); @@ -154,7 +154,7 @@ elm_main(int argc __UNUSED__, b = elm_button_add(win); evas_object_size_hint_weight_set(b, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(b, 0.0, 0.0); - elm_button_label_set(b, "Unfocus top button"); + elm_object_text_set(b, "Unfocus top button"); evas_object_smart_callback_add(b, "clicked", _btn_unfocus_cb, NULL); elm_box_pack_end(box, b); evas_object_show(b); @@ -162,7 +162,7 @@ elm_main(int argc __UNUSED__, check = elm_check_add(win); evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(check, 0.0, 0.0); - elm_check_label_set(check, "Button gets focus"); + elm_object_text_set(check, "Button gets focus"); elm_check_state_pointer_set(check, &d.btn_gets_focus); evas_object_smart_callback_add(check, "changed", _btn_focus_allow_cb, NULL); elm_box_pack_end(box, check); diff --git a/src/examples/theme_example_01.c b/src/examples/theme_example_01.c index 91554cb..e48a369 100644 --- a/src/examples/theme_example_01.c +++ b/src/examples/theme_example_01.c @@ -16,12 +16,12 @@ btn_extension_click_cb(void *data __UNUSED__, Evas_Object *btn, void *ev __UNUSE if (!strncmp(lbl, "Load", 4)) { elm_theme_extension_add(NULL, "./theme_example.edj"); - elm_button_label_set(btn, "Unload extension"); + elm_object_text_set(btn, "Unload extension"); } else if (!strncmp(lbl, "Unload", 6)) { elm_theme_extension_del(NULL, "./theme_example.edj"); - elm_button_label_set(btn, "Load extension"); + elm_object_text_set(btn, "Load extension"); } } @@ -64,13 +64,13 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(box); btn = elm_button_add(win); - elm_button_label_set(btn, "Unload extension"); + elm_object_text_set(btn, "Unload extension"); elm_box_pack_end(box, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", btn_extension_click_cb, NULL); btn = elm_button_add(win); - elm_button_label_set(btn, "Switch style"); + elm_object_text_set(btn, "Switch style"); elm_object_style_set(btn, "chucknorris"); elm_box_pack_end(box, btn); evas_object_show(btn); diff --git a/src/examples/theme_example_02.c b/src/examples/theme_example_02.c index db1a220..8ac2d07 100644 --- a/src/examples/theme_example_02.c +++ b/src/examples/theme_example_02.c @@ -44,25 +44,25 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(box); btn = elm_button_add(win); - elm_button_label_set(btn, "Button 1"); + elm_object_text_set(btn, "Button 1"); elm_box_pack_end(box, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_clicked_cb, NULL); btn = elm_button_add(win); - elm_button_label_set(btn, "Button 2"); + elm_object_text_set(btn, "Button 2"); elm_box_pack_end(box, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_clicked_cb, NULL); btn = elm_button_add(win); - elm_button_label_set(btn, "Button 3"); + elm_object_text_set(btn, "Button 3"); elm_box_pack_end(box, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_clicked_cb, NULL); btn = elm_button_add(win); - elm_button_label_set(btn, "Button 4"); + elm_object_text_set(btn, "Button 4"); elm_box_pack_end(box, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _btn_clicked_cb, NULL); diff --git a/src/examples/transit_example_01.c b/src/examples/transit_example_01.c index 9bf8980..3696307 100644 --- a/src/examples/transit_example_01.c +++ b/src/examples/transit_example_01.c @@ -34,7 +34,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(bg); bt = elm_button_add(win); - elm_button_label_set(bt, "Resizing Effect"); + elm_object_text_set(bt, "Resizing Effect"); evas_object_show(bt); evas_object_move(bt, 50, 100); evas_object_resize(bt, 100, 50); diff --git a/src/examples/transit_example_02.c b/src/examples/transit_example_02.c index d060fd1..bc75b48 100644 --- a/src/examples/transit_example_02.c +++ b/src/examples/transit_example_02.c @@ -34,25 +34,25 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(bg); bt = elm_button_add(win); - elm_button_label_set(bt, "Chain 1"); + elm_object_text_set(bt, "Chain 1"); evas_object_resize(bt, 100, 100); evas_object_move(bt, 0, 0); evas_object_show(bt); bt2 = elm_button_add(win); - elm_button_label_set(bt2, "Chain 2"); + elm_object_text_set(bt2, "Chain 2"); evas_object_resize(bt2, 100, 100); evas_object_move(bt2, 300, 0); evas_object_show(bt2); bt3 = elm_button_add(win); - elm_button_label_set(bt3, "Chain 3"); + elm_object_text_set(bt3, "Chain 3"); evas_object_resize(bt3, 100, 100); evas_object_move(bt3, 300, 300); evas_object_show(bt3); bt4 = elm_button_add(win); - elm_button_label_set(bt4, "Chain 4"); + elm_object_text_set(bt4, "Chain 4"); evas_object_resize(bt4, 100, 100); evas_object_move(bt4, 0, 300); evas_object_show(bt4); diff --git a/src/examples/transit_example_03.c b/src/examples/transit_example_03.c index bdb3396..dfc1269 100644 --- a/src/examples/transit_example_03.c +++ b/src/examples/transit_example_03.c @@ -97,7 +97,7 @@ _checkbox_transition_add(Evas_Object *box, const char *label, Eina_Bool *checked Evas_Object *check = elm_check_add(elm_object_parent_widget_get(box)); evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(check, 0.0, 0.0); - elm_check_label_set(check, label); + elm_object_text_set(check, label); elm_check_state_pointer_set(check, checked); elm_box_pack_end(box, check); evas_object_show(check); @@ -223,7 +223,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) /* this object isn't packed inside the box because we don't want it to have * its size, position, aspect or anything else controled by the container */ obj = elm_button_add(win); - elm_button_label_set(obj, "Transformed object!"); + elm_object_text_set(obj, "Transformed object!"); icon = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR); elm_icon_file_set(icon, buf, NULL); @@ -239,7 +239,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) /* button to start our transition */ btn = elm_button_add(win); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_button_label_set(btn, "Transit!"); + elm_object_text_set(btn, "Transit!"); elm_box_pack_end(box, btn); evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", _transit_start, &context); @@ -278,7 +278,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) cbox = elm_check_add(win); evas_object_size_hint_weight_set(cbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(cbox, 0.0, 0.0); - elm_check_label_set(cbox, "Events enabled"); + elm_object_text_set(cbox, "Events enabled"); elm_check_state_pointer_set(cbox, &context.events_enabled); elm_box_pack_end(vbox2, cbox); evas_object_show(cbox); @@ -286,7 +286,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) cbox = elm_check_add(win); evas_object_size_hint_weight_set(cbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(cbox, 0.0, 0.0); - elm_check_label_set(cbox, "Auto reverse"); + elm_object_text_set(cbox, "Auto reverse"); elm_check_state_pointer_set(cbox, &context.auto_reverse); elm_box_pack_end(vbox2, cbox); evas_object_show(cbox); @@ -294,7 +294,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) cbox = elm_check_add(win); evas_object_size_hint_weight_set(cbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(cbox, 0.0, 0.0); - elm_check_label_set(cbox, "Keep final state"); + elm_object_text_set(cbox, "Keep final state"); elm_check_state_pointer_set(cbox, &context.final_state_keep); elm_box_pack_end(vbox2, cbox); evas_object_show(cbox); diff --git a/src/examples/transit_example_04.c b/src/examples/transit_example_04.c index aded0ee..0915d13 100644 --- a/src/examples/transit_example_04.c +++ b/src/examples/transit_example_04.c @@ -60,7 +60,7 @@ _checkbox_transition_add(Evas_Object *box, const char *label, Eina_Bool *checked Evas_Object *check = elm_check_add(elm_object_parent_widget_get(box)); evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(check, 0.0, 0.0); - elm_check_label_set(check, label); + elm_object_text_set(check, label); elm_check_state_pointer_set(check, checked); elm_box_pack_end(box, check); evas_object_show(check); @@ -128,7 +128,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) /* add an object that we are going to play with */ obj = elm_button_add(win); - elm_button_label_set(obj, "Transformed object!"); + elm_object_text_set(obj, "Transformed object!"); icon = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR); elm_icon_file_set(icon, buf, NULL); @@ -141,7 +141,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) /* add another object that we are going to play with */ obj = elm_button_add(win); - elm_button_label_set(obj, "Another object!"); + elm_object_text_set(obj, "Another object!"); icon = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/icon_08.png", PACKAGE_DATA_DIR); elm_icon_file_set(icon, buf, NULL); @@ -153,7 +153,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) btn = elm_button_add(win); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_button_label_set(btn, "Transit!"); + elm_object_text_set(btn, "Transit!"); elm_box_pack_end(box, btn); evas_object_show(btn);