From: Enlightenment S. <no-...@en...> - 2011-02-03 08:23:25
|
Log: Elementary text-ctxpopup: Enabled scrolling for the last ctxpopup test so it'll also work on small screens. Patch by ChunEon Park (Hermet). Author: tasn Date: 2011-02-03 00:23:19 -0800 (Thu, 03 Feb 2011) New Revision: 56669 Trac: http://trac.enlightenment.org/e/changeset/56669 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-02-03 08:23:14 UTC (rev 56668) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-02-03 08:23:19 UTC (rev 56669) @@ -118,15 +118,28 @@ static void _list_item_cb5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *ctxpopup, *btn; + Evas_Object *ctxpopup, *btn, *sc, *bx; Evas_Coord x,y; - btn = elm_button_add(obj); + bx = elm_box_add(obj); + evas_object_size_hint_min_set(bx, 150, 150); + + sc = elm_scroller_add(bx); + elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE); + evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(sc); + + btn = elm_button_add(sc); elm_button_label_set(btn, "Enlightenment"); - evas_object_size_hint_min_set(btn, 150, 150); + evas_object_size_hint_min_set(btn, 140, 140); + elm_scroller_content_set(sc, btn); + + elm_box_pack_end(bx, sc); + ctxpopup = elm_ctxpopup_add(obj); - elm_ctxpopup_content_set(ctxpopup, btn); + elm_ctxpopup_content_set(ctxpopup, bx); evas_pointer_output_xy_get(evas_object_evas_get(obj), &x, &y); evas_object_move(ctxpopup, x, y); |
From: Enlightenment S. <no-...@en...> - 2011-02-08 14:13:14
|
Log: Elementary test: Added a toggle to switch between UI-mirroring modes. On the fly ui-mirroring is not yet implemented so only new windows will comply (i.e change the toggle and then click on an item from the list). Author: tasn Date: 2011-02-08 06:13:07 -0800 (Tue, 08 Feb 2011) New Revision: 56811 Trac: http://trac.enlightenment.org/e/changeset/56811 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-02-08 14:11:47 UTC (rev 56810) +++ trunk/elementary/src/bin/test.c 2011-02-08 14:13:07 UTC (rev 56811) @@ -157,9 +157,17 @@ } static void +_ui_tg_changed(void *data, Evas_Object *obj, void *event_info) +{ + (void) data; (void) event_info; + elm_mirrored_set(elm_toggle_state_get(obj)); +} + + +static void my_win_main(char *autorun) { - Evas_Object *win, *bg, *bx0, *lb, *li, *idx, *fr; + Evas_Object *win, *bg, *bx0, *lb, *li, *idx, *fr, *tg; Eina_List *tests, *l; struct elm_test *t; @@ -227,6 +235,13 @@ elm_frame_content_set(fr, lb); evas_object_show(lb); + tg = elm_toggle_add(win); + elm_toggle_label_set(tg, "UI-Mirroring:"); + elm_toggle_state_set(tg, elm_mirrored_get()); + evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL); + elm_box_pack_end(bx0, tg); + evas_object_show(tg); + li = elm_list_add(win); elm_list_always_select_mode_set(li, 1); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
From: Enlightenment S. <no-...@en...> - 2011-02-15 12:40:40
|
Log: Elementary: Removed a temp change wasn't meant to be pushed. Author: tasn Date: 2011-02-15 04:40:30 -0800 (Tue, 15 Feb 2011) New Revision: 57046 Trac: http://trac.enlightenment.org/e/changeset/57046 Modified: trunk/elementary/src/bin/test_entry.c Modified: trunk/elementary/src/bin/test_entry.c =================================================================== --- trunk/elementary/src/bin/test_entry.c 2011-02-15 12:32:39 UTC (rev 57045) +++ trunk/elementary/src/bin/test_entry.c 2011-02-15 12:40:30 UTC (rev 57046) @@ -398,8 +398,6 @@ elm_scrolled_entry_entry_set(en, "scrolled entry with icon and end objects"); evas_object_show(en); elm_box_pack_end(bx, en); - elm_scrolled_entry_cursor_end_set(en); - elm_object_focus(en); /* markup scrolled entry */ en = elm_scrolled_entry_add(win); |
From: Enlightenment S. <no-...@en...> - 2011-02-22 16:33:27
|
Log: Elementary test-bubble: Modified the test to include a 'no-icon' style. This exposes an issue introduced in a patch I'll revert in a moment. Author: tasn Date: 2011-02-22 08:33:18 -0800 (Tue, 22 Feb 2011) New Revision: 57243 Trac: http://trac.enlightenment.org/e/changeset/57243 Modified: trunk/elementary/src/bin/test_bubble.c Modified: trunk/elementary/src/bin/test_bubble.c =================================================================== --- trunk/elementary/src/bin/test_bubble.c 2011-02-22 14:58:47 UTC (rev 57242) +++ trunk/elementary/src/bin/test_bubble.c 2011-02-22 16:33:18 UTC (rev 57243) @@ -54,23 +54,15 @@ elm_box_pack_end(bx, bb); evas_object_show(bb); - ic = elm_icon_add(win); - snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); - elm_icon_file_set(ic, buf, NULL); - elm_icon_scale_set(ic, 0, 0); - evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); - bb = elm_bubble_add(win); elm_bubble_label_set(bb, "Message 2"); elm_bubble_info_set(bb, "10:32 4/11/2008"); - elm_bubble_icon_set(bb, ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); - evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL); ct = elm_label_add(win); - elm_label_label_set(ct, "Corner: base (top-left)"); + elm_label_label_set(ct, "Corner: base (top-left) - no icon"); elm_bubble_content_set(bb, ct); elm_box_pack_end(bx, bb); |
From: Enlightenment S. <no-...@en...> - 2011-06-29 07:12:04
|
Log: Elm button: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-06-29 00:11:54 -0700 (Wed, 29 Jun 2011) New Revision: 60800 Trac: http://trac.enlightenment.org/e/changeset/60800 Modified: trunk/elementary/src/bin/config.c trunk/elementary/src/bin/test_anchorblock.c trunk/elementary/src/bin/test_anchorview.c trunk/elementary/src/bin/test_box.c trunk/elementary/src/bin/test_button.c trunk/elementary/src/bin/test_clock.c trunk/elementary/src/bin/test_conform.c trunk/elementary/src/bin/test_ctxpopup.c trunk/elementary/src/bin/test_cursor.c trunk/elementary/src/bin/test_eio.c trunk/elementary/src/bin/test_entry.c trunk/elementary/src/bin/test_fileselector.c trunk/elementary/src/bin/test_fileselector_button.c trunk/elementary/src/bin/test_fileselector_entry.c trunk/elementary/src/bin/test_flip.c trunk/elementary/src/bin/test_flipselector.c trunk/elementary/src/bin/test_focus.c trunk/elementary/src/bin/test_focus2.c trunk/elementary/src/bin/test_focus3.c trunk/elementary/src/bin/test_gengrid.c trunk/elementary/src/bin/test_genlist.c trunk/elementary/src/bin/test_glview.c trunk/elementary/src/bin/test_glview_simple.c trunk/elementary/src/bin/test_grid.c trunk/elementary/src/bin/test_hover.c trunk/elementary/src/bin/test_index.c trunk/elementary/src/bin/test_launcher.c trunk/elementary/src/bin/test_layout.c trunk/elementary/src/bin/test_list.c trunk/elementary/src/bin/test_multi.c trunk/elementary/src/bin/test_notify.c trunk/elementary/src/bin/test_pager.c trunk/elementary/src/bin/test_panes.c trunk/elementary/src/bin/test_photocam.c trunk/elementary/src/bin/test_progressbar.c trunk/elementary/src/bin/test_scaling.c trunk/elementary/src/bin/test_scroller.c trunk/elementary/src/bin/test_separator.c trunk/elementary/src/bin/test_slideshow.c trunk/elementary/src/bin/test_table.c trunk/elementary/src/bin/test_tooltip.c trunk/elementary/src/bin/test_transit.c trunk/elementary/src/bin/test_weather.c trunk/elementary/src/bin/test_win_state.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/config.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -1202,7 +1202,7 @@ bt = elm_button_add(win); evas_object_size_hint_weight_set(bt, 1.0, 0.0); - elm_button_label_set(bt, "Button"); + elm_object_text_set(bt, "Button"); elm_table_pack(base, bt, 0, 0, 1, 1); evas_object_show(bt); @@ -1364,7 +1364,7 @@ /* FIXME: not implemented yet bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _theme_browse, win); - elm_button_label_set(bt, "Browse..."); + elm_object_text_set(bt, "Browse..."); evas_object_size_hint_weight_set(bt, 1.0, 1.0); evas_object_size_hint_align_set(bt, 0.9, 0.9); elm_frame_content_set(pd, bt); @@ -1413,7 +1413,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _theme_use, win); - elm_button_label_set(bt, "Use Theme"); + elm_object_text_set(bt, "Use Theme"); evas_object_size_hint_weight_set(bt, 1.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_frame_content_set(pd, bt); @@ -2008,7 +2008,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _font_overlay_set_all, win); - elm_button_label_set(bt, "Set to All"); + elm_object_text_set(bt, "Set to All"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(bx, bt); @@ -2016,7 +2016,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _font_overlay_reset, win); - elm_button_label_set(bt, "Reset"); + elm_object_text_set(bt, "Reset"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(bx, bt); @@ -2024,7 +2024,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _font_overlay_reset_all, win); - elm_button_label_set(bt, "Reset All"); + elm_object_text_set(bt, "Reset All"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(bx, bt); @@ -2032,7 +2032,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _font_overlay_change, win); - elm_button_label_set(bt, "Apply"); + elm_object_text_set(bt, "Apply"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(bx, bt); @@ -2295,7 +2295,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _profile_use, li); - elm_button_label_set(bt, "Use"); + elm_object_text_set(bt, "Use"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(btn_bx, bt); @@ -2305,7 +2305,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _btn_todo, NULL); /* TODO */ - elm_button_label_set(bt, "Delete"); + elm_object_text_set(bt, "Delete"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(btn_bx, bt); @@ -2315,7 +2315,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _profile_reset, li); - elm_button_label_set(bt, "Reset"); + elm_object_text_set(bt, "Reset"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(btn_bx, bt); @@ -2325,7 +2325,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _btn_todo, NULL); /* TODO */ - elm_button_label_set(bt, "Add new"); + elm_object_text_set(bt, "Add new"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_box_pack_end(btn_bx, bt); @@ -2708,7 +2708,7 @@ bt = elm_button_add(win); evas_object_smart_callback_add(bt, "clicked", _engine_use, li); - elm_button_label_set(bt, "Use Engine"); + elm_object_text_set(bt, "Use Engine"); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_size_hint_align_set(bt, 0.5, 0.5); elm_frame_content_set(pd, bt); Modified: trunk/elementary/src/bin/test_anchorblock.c =================================================================== --- trunk/elementary/src/bin/test_anchorblock.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_anchorblock.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -25,7 +25,7 @@ Evas_Object *bt, *bx; bt = elm_button_add(obj); - elm_button_label_set(bt, ei->name); + elm_object_text_set(bt, ei->name); elm_hover_content_set(ei->hover, "middle", bt); evas_object_show(bt); @@ -34,17 +34,17 @@ { bx = elm_box_add(obj); bt = elm_button_add(obj); - elm_button_label_set(bt, "Top 1"); + elm_object_text_set(bt, "Top 1"); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av); evas_object_show(bt); bt = elm_button_add(obj); - elm_button_label_set(bt, "Top 2"); + elm_object_text_set(bt, "Top 2"); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av); evas_object_show(bt); bt = elm_button_add(obj); - elm_button_label_set(bt, "Top 3"); + elm_object_text_set(bt, "Top 3"); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av); evas_object_show(bt); @@ -54,7 +54,7 @@ if (ei->hover_bottom) { bt = elm_button_add(obj); - elm_button_label_set(bt, "Bot"); + elm_object_text_set(bt, "Bot"); elm_hover_content_set(ei->hover, "bottom", bt); evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av); evas_object_show(bt); @@ -62,7 +62,7 @@ if (ei->hover_left) { bt = elm_button_add(obj); - elm_button_label_set(bt, "Left"); + elm_object_text_set(bt, "Left"); elm_hover_content_set(ei->hover, "left", bt); evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av); evas_object_show(bt); @@ -70,7 +70,7 @@ if (ei->hover_right) { bt = elm_button_add(obj); - elm_button_label_set(bt, "Right"); + elm_object_text_set(bt, "Right"); elm_hover_content_set(ei->hover, "right", bt); evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av); evas_object_show(bt); Modified: trunk/elementary/src/bin/test_anchorview.c =================================================================== --- trunk/elementary/src/bin/test_anchorview.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_anchorview.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -18,7 +18,7 @@ Evas_Object *bt, *bx; bt = elm_button_add(obj); - elm_button_label_set(bt, ei->name); + elm_object_text_set(bt, ei->name); elm_hover_content_set(ei->hover, "middle", bt); evas_object_show(bt); @@ -27,17 +27,17 @@ { bx = elm_box_add(obj); bt = elm_button_add(obj); - elm_button_label_set(bt, "Top 1"); + elm_object_text_set(bt, "Top 1"); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av); evas_object_show(bt); bt = elm_button_add(obj); - elm_button_label_set(bt, "Top 2"); + elm_object_text_set(bt, "Top 2"); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av); evas_object_show(bt); bt = elm_button_add(obj); - elm_button_label_set(bt, "Top 3"); + elm_object_text_set(bt, "Top 3"); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av); evas_object_show(bt); @@ -47,7 +47,7 @@ if (ei->hover_bottom) { bt = elm_button_add(obj); - elm_button_label_set(bt, "Bot"); + elm_object_text_set(bt, "Bot"); elm_hover_content_set(ei->hover, "bottom", bt); evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av); evas_object_show(bt); @@ -55,7 +55,7 @@ if (ei->hover_left) { bt = elm_button_add(obj); - elm_button_label_set(bt, "Left"); + elm_object_text_set(bt, "Left"); elm_hover_content_set(ei->hover, "left", bt); evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av); evas_object_show(bt); @@ -63,7 +63,7 @@ if (ei->hover_right) { bt = elm_button_add(obj); - elm_button_label_set(bt, "Right"); + elm_object_text_set(bt, "Right"); elm_hover_content_set(ei->hover, "right", bt); evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av); evas_object_show(bt); Modified: trunk/elementary/src/bin/test_box.c =================================================================== --- trunk/elementary/src/bin/test_box.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_box.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -80,7 +80,7 @@ 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_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); @@ -88,7 +88,7 @@ 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_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); @@ -96,7 +96,7 @@ 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_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); @@ -104,7 +104,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 4"); + elm_object_text_set(bt, "Button 4"); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); @@ -112,7 +112,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 5"); + elm_object_text_set(bt, "Button 5"); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, 0.0, 0.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); @@ -225,7 +225,7 @@ 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_size_hint_weight_set(bt, 1.0, 1.0); evas_object_size_hint_align_set(bt, -1.0, -1.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); @@ -234,7 +234,7 @@ 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, 1.0, 1.0); evas_object_size_hint_align_set(bt, -1.0, -1.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); @@ -243,7 +243,7 @@ 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_size_hint_weight_set(bt, 1.0, 1.0); evas_object_size_hint_align_set(bt, -1.0, -1.0); evas_object_smart_callback_add(bt, "clicked", _del_cb, bx); Modified: trunk/elementary/src/bin/test_button.c =================================================================== --- trunk/elementary/src/bin/test_button.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_button.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -12,7 +12,7 @@ snprintf(buf, sizeof(buf), "count=%d", count++); if (count >= 10000) count = 0; - elm_button_label_set(obj, buf); + elm_object_text_set(obj, buf); } static void @@ -63,7 +63,7 @@ elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); - elm_button_label_set(bt, "Icon sized to button"); + elm_object_text_set(bt, "Icon sized to button"); elm_button_icon_set(bt, ic); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)1); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)1); @@ -76,7 +76,7 @@ elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); bt = elm_button_add(win); - elm_button_label_set(bt, "Icon no scale"); + elm_object_text_set(bt, "Icon no scale"); elm_button_icon_set(bt, ic); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)2); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)2); @@ -89,7 +89,7 @@ elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); - elm_button_label_set(bt, "Disabled Button"); + elm_object_text_set(bt, "Disabled Button"); elm_button_icon_set(bt, ic); elm_object_disabled_set(bt, 1); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)3); @@ -112,7 +112,7 @@ evas_object_show(ic); bt = elm_button_add(win); - elm_button_label_set(bt, "Label Only"); + elm_object_text_set(bt, "Label Only"); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)5); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)5); elm_box_pack_end(bx, bt); @@ -136,7 +136,7 @@ bt = elm_button_add(win); elm_object_style_set(bt, "anchor"); - elm_button_label_set(bt, "Anchor style"); + elm_object_text_set(bt, "Anchor style"); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)7); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)7); elm_box_pack_end(bx, bt); Modified: trunk/elementary/src/bin/test_clock.c =================================================================== --- trunk/elementary/src/bin/test_clock.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_clock.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -75,11 +75,11 @@ Evas_Object *ck = data; if (!elm_clock_edit_get(ck)) { - elm_button_label_set(obj, "Done"); + elm_object_text_set(obj, "Done"); elm_clock_edit_set(ck, 1); return; } - elm_button_label_set(obj, "Edit"); + elm_object_text_set(obj, "Edit"); elm_clock_edit_set(ck, 0); } @@ -89,11 +89,11 @@ Evas_Object *ck = data; if (!elm_clock_show_am_pm_get(ck)) { - elm_button_label_set(obj, "24h"); + elm_object_text_set(obj, "24h"); elm_clock_show_am_pm_set(ck, 1); return; } - elm_button_label_set(obj, "12h"); + elm_object_text_set(obj, "12h"); elm_clock_show_am_pm_set(ck, 0); } @@ -129,13 +129,13 @@ evas_object_show(hbx); bt = elm_button_add(win); - elm_button_label_set(bt, "Edit"); + elm_object_text_set(bt, "Edit"); evas_object_smart_callback_add(bt, "clicked", _edit_bt_clicked, ck); elm_box_pack_end(hbx, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "24h"); + elm_object_text_set(bt, "24h"); evas_object_smart_callback_add(bt, "clicked", _hmode_bt_clicked, ck); elm_box_pack_end(hbx, bt); evas_object_show(bt); Modified: trunk/elementary/src/bin/test_conform.c =================================================================== --- trunk/elementary/src/bin/test_conform.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_conform.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -39,7 +39,7 @@ elm_box_pack_end(bx, en); btn = elm_button_add(win); - elm_button_label_set(btn, "Test Conformant"); + elm_object_text_set(btn, "Test Conformant"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, btn); @@ -56,7 +56,7 @@ elm_box_pack_end(bx, en); btn = elm_button_add(win); - elm_button_label_set(btn, "Test Conformant"); + elm_object_text_set(btn, "Test Conformant"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, btn); @@ -126,7 +126,7 @@ btn = elm_button_add(win); elm_object_focus_allow_set(btn, 0); - elm_button_label_set(btn, "Delete Below"); + elm_object_text_set(btn, "Delete Below"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, btn); @@ -161,7 +161,7 @@ btn = elm_button_add(win); elm_object_focus_allow_set(btn, 0); - elm_button_label_set(btn, "Delete this bottom bit 1"); + elm_object_text_set(btn, "Delete this bottom bit 1"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, btn); @@ -193,7 +193,7 @@ btn = elm_button_add(win); elm_object_focus_allow_set(btn, 0); - elm_button_label_set(btn, "Delete this bottom bit 2"); + elm_object_text_set(btn, "Delete this bottom bit 2"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, btn); Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -131,7 +131,7 @@ evas_object_show(sc); btn = elm_button_add(sc); - elm_button_label_set(btn, "Enlightenment"); + elm_object_text_set(btn, "Enlightenment"); evas_object_size_hint_min_set(btn, 140, 140); elm_scroller_content_set(sc, btn); Modified: trunk/elementary/src/bin/test_cursor.c =================================================================== --- trunk/elementary/src/bin/test_cursor.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_cursor.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -121,13 +121,13 @@ bt = elm_button_add(win); elm_object_cursor_set(bt, ELM_CURSOR_COFFEE_MUG); - elm_button_label_set(bt, "Coffee Mug"); + elm_object_text_set(bt, "Coffee Mug"); elm_box_pack_end(bx, bt); evas_object_show(bt); bt = elm_button_add(win); elm_object_cursor_set(bt, ELM_CURSOR_CLOCK); - elm_button_label_set(bt, "Cursor unset"); + elm_object_text_set(bt, "Cursor unset"); elm_object_cursor_unset(bt); elm_box_pack_end(bx, bt); evas_object_show(bt); @@ -311,27 +311,27 @@ o = elm_button_add(win); elm_object_cursor_set(o, ELM_CURSOR_HAND1); elm_object_cursor_engine_only_set(o, EINA_FALSE); - elm_button_label_set(o, "hand1"); + elm_object_text_set(o, "hand1"); elm_box_pack_end(bx, o); evas_object_show(o); o = elm_button_add(win); elm_object_cursor_set(o, ELM_CURSOR_HAND2); - elm_button_label_set(o, "hand2 x"); + elm_object_text_set(o, "hand2 x"); elm_box_pack_end(bx, o); evas_object_show(o); o = elm_button_add(win); elm_object_cursor_set(o, ELM_CURSOR_HAND2); elm_object_cursor_engine_only_set(o, EINA_FALSE); - elm_button_label_set(o, "hand2"); + elm_object_text_set(o, "hand2"); elm_box_pack_end(bx, o); evas_object_show(o); o = elm_button_add(win); elm_object_cursor_set(o, "hand3"); elm_object_cursor_engine_only_set(o, EINA_FALSE); - elm_button_label_set(o, "hand3"); + elm_object_text_set(o, "hand3"); elm_box_pack_end(bx, o); evas_object_show(o); @@ -339,7 +339,7 @@ elm_object_cursor_set(o, "hand3"); elm_object_cursor_engine_only_set(o, EINA_FALSE); elm_object_cursor_style_set(o, "transparent"); - elm_button_label_set(o, "hand3 transparent"); + elm_object_text_set(o, "hand3 transparent"); elm_box_pack_end(bx, o); evas_object_show(o); @@ -347,27 +347,27 @@ elm_object_cursor_set(o, "hand3"); elm_object_cursor_engine_only_set(o, EINA_FALSE); elm_object_cursor_unset(o); - elm_button_label_set(o, "unset"); + elm_object_text_set(o, "unset"); elm_box_pack_end(bx, o); evas_object_show(o); o = elm_button_add(win); elm_object_cursor_set(o, "hand4"); - elm_button_label_set(o, "not existent"); + elm_object_text_set(o, "not existent"); elm_box_pack_end(bx, o); evas_object_show(o); elm_cursor_engine_only_set(0); o = elm_button_add(win); elm_object_cursor_set(o, "hand2"); - elm_button_label_set(o, "hand 2 engine only config false"); + elm_object_text_set(o, "hand 2 engine only config false"); elm_box_pack_end(bx, o); evas_object_show(o); elm_cursor_engine_only_set(1); o = elm_button_add(win); elm_object_cursor_set(o, "hand2"); - elm_button_label_set(o, "hand 2 engine only config true"); + elm_object_text_set(o, "hand 2 engine only config true"); elm_box_pack_end(bx, o); evas_object_show(o); Modified: trunk/elementary/src/bin/test_eio.c =================================================================== --- trunk/elementary/src/bin/test_eio.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_eio.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -164,7 +164,7 @@ /* attribute setting buttons */ bt = elm_button_add(win); - elm_button_label_set(bt, "clear"); + elm_object_text_set(bt, "clear"); evas_object_smart_callback_add(bt, "clicked", _test_eio_clear, gl); elm_box_pack_end(hbox, bt); evas_object_show(bt); Modified: trunk/elementary/src/bin/test_entry.c =================================================================== --- trunk/elementary/src/bin/test_entry.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_entry.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -139,7 +139,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Clr"); + elm_object_text_set(bt, "Clr"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_1, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -149,7 +149,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Prnt"); + elm_object_text_set(bt, "Prnt"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_2, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -159,7 +159,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Sel"); + elm_object_text_set(bt, "Sel"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_3, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -169,7 +169,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Ins"); + elm_object_text_set(bt, "Ins"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_4, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -179,7 +179,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Scrl"); + elm_object_text_set(bt, "Scrl"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_5, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -189,7 +189,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Wr"); + elm_object_text_set(bt, "Wr"); evas_object_smart_callback_add(bt, "clicked", my_entry_bt_6, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -476,7 +476,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Clear"); + elm_object_text_set(bt, "Clear"); evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_1, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -486,7 +486,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Print"); + elm_object_text_set(bt, "Print"); evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_2, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -496,7 +496,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Print pwd"); + elm_object_text_set(bt, "Print pwd"); evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_5, en_p); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -506,7 +506,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Selection"); + elm_object_text_set(bt, "Selection"); evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_3, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -516,7 +516,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Insert"); + elm_object_text_set(bt, "Insert"); evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_4, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -750,7 +750,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Clr"); + elm_object_text_set(bt, "Clr"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_clr, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -760,7 +760,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Pri"); + elm_object_text_set(bt, "Pri"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pri, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -770,7 +770,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Sel"); + elm_object_text_set(bt, "Sel"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sel, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -780,7 +780,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "All"); + elm_object_text_set(bt, "All"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_all, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -790,7 +790,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Non"); + elm_object_text_set(bt, "Non"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_non, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -800,7 +800,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Ins"); + elm_object_text_set(bt, "Ins"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_ins, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -818,7 +818,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Lef"); + elm_object_text_set(bt, "Lef"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lef, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -828,7 +828,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Rig"); + elm_object_text_set(bt, "Rig"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_rig, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -838,7 +838,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Up "); + elm_object_text_set(bt, "Up "); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_up_, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -848,7 +848,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Dow"); + elm_object_text_set(bt, "Dow"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_dow, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -858,7 +858,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Beg"); + elm_object_text_set(bt, "Beg"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_beg, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -868,7 +868,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "End"); + elm_object_text_set(bt, "End"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_end, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -886,7 +886,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "LBe"); + elm_object_text_set(bt, "LBe"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lbe, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -896,7 +896,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "LEn"); + elm_object_text_set(bt, "LEn"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_len, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -906,7 +906,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "SBe"); + elm_object_text_set(bt, "SBe"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sbe, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -916,7 +916,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "SEn"); + elm_object_text_set(bt, "SEn"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sen, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -926,7 +926,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Fmt"); + elm_object_text_set(bt, "Fmt"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_fmt, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -936,7 +936,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "VFm"); + elm_object_text_set(bt, "VFm"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_vfm, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -954,7 +954,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Chr"); + elm_object_text_set(bt, "Chr"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_chr, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -964,7 +964,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Cut"); + elm_object_text_set(bt, "Cut"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cut, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -974,7 +974,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Cop"); + elm_object_text_set(bt, "Cop"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cop, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -984,7 +984,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Pas"); + elm_object_text_set(bt, "Pas"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1024,7 +1024,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Clr"); + elm_object_text_set(bt, "Clr"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_clr, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1034,7 +1034,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Pri"); + elm_object_text_set(bt, "Pri"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pri, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1044,7 +1044,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Sel"); + elm_object_text_set(bt, "Sel"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sel, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1054,7 +1054,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "All"); + elm_object_text_set(bt, "All"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_all, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1064,7 +1064,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Non"); + elm_object_text_set(bt, "Non"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_non, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1074,7 +1074,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Ins"); + elm_object_text_set(bt, "Ins"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_ins, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1092,7 +1092,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Lef"); + elm_object_text_set(bt, "Lef"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lef, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1102,7 +1102,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Rig"); + elm_object_text_set(bt, "Rig"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_rig, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1112,7 +1112,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Up "); + elm_object_text_set(bt, "Up "); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_up_, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1122,7 +1122,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Dow"); + elm_object_text_set(bt, "Dow"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_dow, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1132,7 +1132,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Beg"); + elm_object_text_set(bt, "Beg"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_beg, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1142,7 +1142,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "End"); + elm_object_text_set(bt, "End"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_end, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1160,7 +1160,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "LBe"); + elm_object_text_set(bt, "LBe"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lbe, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1170,7 +1170,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "LEn"); + elm_object_text_set(bt, "LEn"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_len, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1180,7 +1180,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "SBe"); + elm_object_text_set(bt, "SBe"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sbe, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1190,7 +1190,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "SEn"); + elm_object_text_set(bt, "SEn"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sen, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1200,7 +1200,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Fmt"); + elm_object_text_set(bt, "Fmt"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_fmt, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1210,7 +1210,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "VFm"); + elm_object_text_set(bt, "VFm"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_vfm, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1228,7 +1228,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Chr"); + elm_object_text_set(bt, "Chr"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_chr, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1238,7 +1238,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Cut"); + elm_object_text_set(bt, "Cut"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cut, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1248,7 +1248,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Cop"); + elm_object_text_set(bt, "Cop"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cop, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1258,7 +1258,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Pas"); + elm_object_text_set(bt, "Pas"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1389,7 +1389,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Clr"); + elm_object_text_set(bt, "Clr"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_clr, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1399,7 +1399,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Pri"); + elm_object_text_set(bt, "Pri"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pri, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1409,7 +1409,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Sel"); + elm_object_text_set(bt, "Sel"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sel, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1419,7 +1419,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "All"); + elm_object_text_set(bt, "All"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_all, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1429,7 +1429,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Non"); + elm_object_text_set(bt, "Non"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_non, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1439,7 +1439,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Ins"); + elm_object_text_set(bt, "Ins"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_ins, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1457,7 +1457,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Lef"); + elm_object_text_set(bt, "Lef"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lef, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1467,7 +1467,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Rig"); + elm_object_text_set(bt, "Rig"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_rig, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1477,7 +1477,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Up "); + elm_object_text_set(bt, "Up "); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_up_, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1487,7 +1487,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Dow"); + elm_object_text_set(bt, "Dow"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_dow, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1497,7 +1497,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Beg"); + elm_object_text_set(bt, "Beg"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_beg, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1507,7 +1507,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "End"); + elm_object_text_set(bt, "End"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_end, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1525,7 +1525,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "LBe"); + elm_object_text_set(bt, "LBe"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lbe, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1535,7 +1535,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "LEn"); + elm_object_text_set(bt, "LEn"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_len, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1545,7 +1545,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "SBe"); + elm_object_text_set(bt, "SBe"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sbe, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1555,7 +1555,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "SEn"); + elm_object_text_set(bt, "SEn"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sen, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1565,7 +1565,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Fmt"); + elm_object_text_set(bt, "Fmt"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_fmt, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1575,7 +1575,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "VFm"); + elm_object_text_set(bt, "VFm"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_vfm, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1593,7 +1593,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Chr"); + elm_object_text_set(bt, "Chr"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_chr, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1603,7 +1603,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Cut"); + elm_object_text_set(bt, "Cut"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cut, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1613,7 +1613,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Cop"); + elm_object_text_set(bt, "Cop"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cop, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1623,7 +1623,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Pas"); + elm_object_text_set(bt, "Pas"); evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -1682,7 +1682,7 @@ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_button_add(win); - elm_button_label_set(bt, "Clear"); + elm_object_text_set(bt, "Clear"); evas_object_smart_callback_add(bt, "clicked", _scrolled_entry_clear, np); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); Modified: trunk/elementary/src/bin/test_fileselector.c =================================================================== --- trunk/elementary/src/bin/test_fileselector.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_fileselector.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -188,19 +188,19 @@ evas_object_show(hbox); bt = elm_button_add(win); - elm_button_label_set(bt, "selected get"); + elm_object_text_set(bt, "selected get"); evas_object_smart_callback_add(bt, "clicked", _sel_get_clicked, fs); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "path get"); + elm_object_text_set(bt, "path get"); evas_object_smart_callback_add(bt, "clicked", _path_get_clicked, fs); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "mode cycle"); + elm_object_text_set(bt, "mode cycle"); evas_object_smart_callback_add(bt, "clicked", _mode_cycle_clicked, fs); elm_box_pack_end(hbox, bt); evas_object_show(bt); Modified: trunk/elementary/src/bin/test_fileselector_button.c =================================================================== --- trunk/elementary/src/bin/test_fileselector_button.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_fileselector_button.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -105,25 +105,25 @@ evas_object_show(hbox); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle current selection text entry"); + elm_object_text_set(bt, "Toggle current selection text entry"); evas_object_smart_callback_add(bt, "clicked", _current_sel_toggle, fs_bt); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle inwin mode"); + elm_object_text_set(bt, "Toggle inwin mode"); evas_object_smart_callback_add(bt, "clicked", _inwin_mode_toggle, fs_bt); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle folder only mode"); + elm_object_text_set(bt, "Toggle folder only mode"); evas_object_smart_callback_add(bt, "clicked", _folder_only_toggle, fs_bt); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle expandable mode"); + elm_object_text_set(bt, "Toggle expandable mode"); evas_object_smart_callback_add(bt, "clicked", _expandable_toggle, fs_bt); elm_box_pack_end(hbox, bt); evas_object_show(bt); Modified: trunk/elementary/src/bin/test_fileselector_entry.c =================================================================== --- trunk/elementary/src/bin/test_fileselector_entry.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_fileselector_entry.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -112,19 +112,19 @@ evas_object_show(hbox); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle inwin mode"); + elm_object_text_set(bt, "Toggle inwin mode"); evas_object_smart_callback_add(bt, "clicked", _inwin_mode_toggle, fs_en); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle folder only mode"); + elm_object_text_set(bt, "Toggle folder only mode"); evas_object_smart_callback_add(bt, "clicked", _folder_only_toggle, fs_en); elm_box_pack_end(hbox, bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle expandable mode"); + elm_object_text_set(bt, "Toggle expandable mode"); evas_object_smart_callback_add(bt, "clicked", _expandable_toggle, fs_en); elm_box_pack_end(hbox, bt); evas_object_show(bt); @@ -140,7 +140,7 @@ evas_object_show(hbox); bt = elm_button_add(win); - elm_button_label_set(bt, "Toggle disabled"); + elm_object_text_set(bt, "Toggle disabled"); evas_object_smart_callback_add(bt, "clicked", _disabled_toggle, fs_en); elm_box_pack_end(hbox, bt); evas_object_show(bt); Modified: trunk/elementary/src/bin/test_flip.c =================================================================== --- trunk/elementary/src/bin/test_flip.c 2011-06-29 07:11:50 UTC (rev 60799) +++ trunk/elementary/src/bin/test_flip.c 2011-06-29 07:11:54 UTC (rev 60800) @@ -103,17 +103,17 @@ evas_object_show(ly); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 1"); + elm_object_text_set(bt, "Button 1"); elm_layout_content_set(ly, "element1", bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 2"); + elm_object_text_set(bt, "Button 2"); elm_layout_content_set(ly, "element2", bt); evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "Button 3"); + elm_object_text_set(bt, "Button 3"); elm_layout_content_set(ly, "element3", bt); evas_object_show(bt); @@ -125,7 +125,7 @@ evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); bt = elm_button_add(win); - elm_button_label_set(bt, "1"); + elm_object_text_set(bt, "1"); evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -133,7 +133,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "2"); + elm_object_text_set(bt, "2"); evas_object_smart_callback_add(bt, "clicked", my_fl_2, fl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -141,7 +141,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "3"); + elm_object_text_set(bt, "3"); evas_object_smart_callback_add(bt, "clicked", my_fl_3, fl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -149,7 +149,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "4"); + elm_object_text_set(bt, "4"); evas_object_smart_callback_add(bt, "clicked", my_fl_4, fl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -165,7 +165,7 @@ evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); bt = elm_button_add(win); - elm_button_label_set(bt, "5"); + elm_object_text_set(bt, "5"); evas_object_smart_callback_add(bt, "clicked", my_fl_5, fl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -173,7 +173,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "6"); + elm_object_text_set(bt, "6"); evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -181,7 +181,7 @@ evas_object_show(bt); bt = elm_button_add(win); - elm_button_label_set(bt, "7"); + elm_object_text_set(bt, "7"); evas_object_smart_callback_add(bt, "clicked", my_fl_7, fl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -189,7 +189,7 @@ evas_object_show(bt); bt = elm_butt... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2011-06-29 08:57:49
|
Log: Elm toggle: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-06-29 01:57:43 -0700 (Wed, 29 Jun 2011) New Revision: 60803 Trac: http://trac.enlightenment.org/e/changeset/60803 Modified: trunk/elementary/src/bin/test.c trunk/elementary/src/bin/test_genlist.c trunk/elementary/src/bin/test_toggle.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-06-29 08:57:40 UTC (rev 60802) +++ trunk/elementary/src/bin/test.c 2011-06-29 08:57:43 UTC (rev 60803) @@ -257,7 +257,7 @@ evas_object_show(lb); tg = elm_toggle_add(win); - elm_toggle_label_set(tg, "UI-Mirroring:"); + elm_object_text_set(tg, "UI-Mirroring:"); elm_toggle_state_set(tg, elm_mirrored_get()); evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL); elm_box_pack_end(bx0, tg); Modified: trunk/elementary/src/bin/test_genlist.c =================================================================== --- trunk/elementary/src/bin/test_genlist.c 2011-06-29 08:57:40 UTC (rev 60802) +++ trunk/elementary/src/bin/test_genlist.c 2011-06-29 08:57:43 UTC (rev 60803) @@ -1851,7 +1851,7 @@ evas_object_show(gl); tg = elm_toggle_add(win); - elm_toggle_label_set(tg, "Reorder Mode:"); + elm_object_text_set(tg, "Reorder Mode:"); elm_toggle_state_set(tg, elm_mirrored_get()); evas_object_smart_callback_add(tg, "changed", _reorder_tg_changed_cb, gl); elm_box_pack_end(bx, tg); Modified: trunk/elementary/src/bin/test_toggle.c =================================================================== --- trunk/elementary/src/bin/test_toggle.c 2011-06-29 08:57:40 UTC (rev 60802) +++ trunk/elementary/src/bin/test_toggle.c 2011-06-29 08:57:43 UTC (rev 60803) @@ -31,7 +31,7 @@ tg = elm_toggle_add(win); evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, 0.5); - elm_toggle_label_set(tg, "Icon sized to toggle"); + elm_object_text_set(tg, "Icon sized to toggle"); elm_toggle_icon_set(tg, ic); elm_toggle_state_set(tg, 1); elm_toggle_states_labels_set(tg, "Yes", "No"); @@ -45,7 +45,7 @@ elm_icon_scale_set(ic, 0, 0); tg = elm_toggle_add(win); - elm_toggle_label_set(tg, "Icon no scale"); + elm_object_text_set(tg, "Icon no scale"); elm_toggle_icon_set(tg, ic); elm_box_pack_end(bx, tg); evas_object_show(tg); @@ -57,7 +57,7 @@ elm_icon_scale_set(ic, 0, 0); tg = elm_toggle_add(win); - elm_toggle_label_set(tg, "Icon no scale"); + elm_object_text_set(tg, "Icon no scale"); elm_toggle_icon_set(tg, ic); elm_object_disabled_set(tg, 1); elm_box_pack_end(bx, tg); @@ -65,7 +65,7 @@ evas_object_show(ic); tg = elm_toggle_add(win); - elm_toggle_label_set(tg, "Label Only"); + elm_object_text_set(tg, "Label Only"); elm_toggle_states_labels_set(tg, "Big long fun times label", "Small long happy fun label"); elm_box_pack_end(bx, tg); |
From: Enlightenment S. <no-...@en...> - 2011-06-29 09:11:55
|
Log: Elm frame: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-06-29 02:11:48 -0700 (Wed, 29 Jun 2011) New Revision: 60806 Trac: http://trac.enlightenment.org/e/changeset/60806 Modified: trunk/elementary/src/bin/config.c trunk/elementary/src/bin/test.c trunk/elementary/src/bin/test_colorselector.c trunk/elementary/src/bin/test_flip.c trunk/elementary/src/bin/test_focus.c trunk/elementary/src/bin/test_genlist.c trunk/elementary/src/bin/test_scaling.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-06-29 09:11:45 UTC (rev 60805) +++ trunk/elementary/src/bin/config.c 2011-06-29 09:11:48 UTC (rev 60806) @@ -550,7 +550,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ _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 @@ 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 @@ 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 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-06-29 09:11:45 UTC (rev 60805) +++ trunk/elementary/src/bin/test.c 2011-06-29 09:11:48 UTC (rev 60806) @@ -244,7 +244,7 @@ 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); Modified: trunk/elementary/src/bin/test_colorselector.c =================================================================== --- trunk/elementary/src/bin/test_colorselector.c 2011-06-29 09:11:45 UTC (rev 60805) +++ trunk/elementary/src/bin/test_colorselector.c 2011-06-29 09:11:48 UTC (rev 60806) @@ -46,7 +46,7 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test_flip.c =================================================================== --- trunk/elementary/src/bin/test_flip.c 2011-06-29 09:11:45 UTC (rev 60805) +++ trunk/elementary/src/bin/test_flip.c 2011-06-29 09:11:48 UTC (rev 60806) @@ -400,7 +400,7 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test_focus.c =================================================================== --- trunk/elementary/src/bin/test_focus.c 2011-06-29 09:11:45 UTC (rev 60805) +++ trunk/elementary/src/bin/test_focus.c 2011-06-29 09:11:48 UTC (rev 60806) @@ -320,7 +320,7 @@ { 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); Modified: trunk/elementary/src/bin/test_genlist.c =================================================================== --- trunk/elementary/src/bin/test_genlist.c 2011-06-29 09:11:45 UTC (rev 60805) +++ trunk/elementary/src/bin/test_genlist.c 2011-06-29 09:11:48 UTC (rev 60806) @@ -1717,7 +1717,7 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test_scaling.c =================================================================== --- trunk/elementary/src/bin/test_scaling.c 2011-06-29 09:11:45 UTC (rev 60805) +++ trunk/elementary/src/bin/test_scaling.c 2011-06-29 09:11:48 UTC (rev 60806) @@ -83,7 +83,7 @@ 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<br>" @@ -95,7 +95,7 @@ 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<br>" @@ -108,7 +108,7 @@ 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<br>" |
From: Enlightenment S. <no-...@en...> - 2011-06-29 09:31:05
|
Log: Elm layout: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-06-29 02:30:58 -0700 (Wed, 29 Jun 2011) New Revision: 60808 Trac: http://trac.enlightenment.org/e/changeset/60808 Modified: trunk/elementary/src/bin/config.c trunk/elementary/src/bin/test_layout.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-06-29 09:30:56 UTC (rev 60807) +++ trunk/elementary/src/bin/config.c 2011-06-29 09:30:58 UTC (rev 60808) @@ -1977,7 +1977,7 @@ snprintf(buf, sizeof(buf), "%s/objects/font_preview.edj", PACKAGE_DATA_DIR); preview = elm_layout_add(win); elm_layout_file_set(preview, buf, "font_preview"); - elm_layout_text_set(preview, "elm.text", "Preview Text — 我真的会写中文"); + elm_object_label_set(preview, "elm.text", "Preview Text — 我真的会写中文"); evas_object_size_hint_weight_set(preview, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(preview, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(preview); Modified: trunk/elementary/src/bin/test_layout.c =================================================================== --- trunk/elementary/src/bin/test_layout.c 2011-06-29 09:30:56 UTC (rev 60807) +++ trunk/elementary/src/bin/test_layout.c 2011-06-29 09:30:58 UTC (rev 60808) @@ -8,7 +8,7 @@ static void _clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { - elm_layout_text_set(data, "text", elm_object_text_get(obj)); + elm_object_label_set(data, "text", elm_object_text_get(obj)); } void @@ -34,7 +34,7 @@ ly = elm_layout_add(win); elm_layout_theme_set(ly, "layout", "application", "titlebar"); - elm_layout_label_set(ly, "Some title"); + elm_object_text_set(ly, "Some title"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(box, ly); |
From: Enlightenment S. <no-...@en...> - 2011-06-30 05:58:39
|
Log: Elm slider: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-06-29 22:58:32 -0700 (Wed, 29 Jun 2011) New Revision: 60863 Trac: http://trac.enlightenment.org/e/changeset/60863 Modified: trunk/elementary/src/bin/config.c trunk/elementary/src/bin/test_3d.c trunk/elementary/src/bin/test_slider.c trunk/elementary/src/bin/test_win_state.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/config.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -1236,7 +1236,7 @@ evas_object_show(sp); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Slider"); + elm_object_text_set(sl, "Slider"); elm_slider_span_size_set(sl, 120); elm_slider_min_max_set(sl, 1, 10); elm_slider_value_set(sl, 4); Modified: trunk/elementary/src/bin/test_3d.c =================================================================== --- trunk/elementary/src/bin/test_3d.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/test_3d.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -259,7 +259,7 @@ evas_object_show(bx); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Rot X"); + elm_object_text_set(sl, "Rot X"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 0, 360); @@ -270,7 +270,7 @@ evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Rot Y"); + elm_object_text_set(sl, "Rot Y"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 0, 360); @@ -281,7 +281,7 @@ evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Rot Z"); + elm_object_text_set(sl, "Rot Z"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 0, 360); @@ -292,7 +292,7 @@ evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "CX Off"); + elm_object_text_set(sl, "CX Off"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, -320, 320); @@ -304,7 +304,7 @@ evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "CY Off"); + elm_object_text_set(sl, "CY Off"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, -320, 320); @@ -316,7 +316,7 @@ evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Foc"); + elm_object_text_set(sl, "Foc"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 1, 2000); @@ -328,7 +328,7 @@ evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Z0"); + elm_object_text_set(sl, "Z0"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, -2000, 2000); Modified: trunk/elementary/src/bin/test_slider.c =================================================================== --- trunk/elementary/src/bin/test_slider.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/test_slider.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -38,7 +38,7 @@ sl = elm_slider_add(win); sl1 = sl; - elm_slider_label_set(sl, "Horizontal"); + elm_object_text_set(sl, "Horizontal"); elm_slider_icon_set(sl, ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); @@ -55,7 +55,7 @@ evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Disabled"); + elm_object_text_set(sl, "Disabled"); elm_slider_icon_set(sl, ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); @@ -74,7 +74,7 @@ evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Horizontal inverted"); + elm_object_text_set(sl, "Horizontal inverted"); elm_slider_end_set(sl, ic); elm_slider_span_size_set(sl, 80); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -96,7 +96,7 @@ evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Disabled inverted"); + elm_object_text_set(sl, "Disabled inverted"); elm_slider_end_set(sl, ic); elm_slider_span_size_set(sl, 80); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -114,7 +114,7 @@ sl = elm_slider_add(win); elm_slider_indicator_show_set(sl, EINA_FALSE); - elm_slider_label_set(sl, "Scale doubled"); + elm_object_text_set(sl, "Scale doubled"); elm_slider_unit_format_set(sl, "%3.0f units"); elm_slider_span_size_set(sl, 40); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -141,7 +141,7 @@ sl = elm_slider_add(win); elm_slider_icon_set(sl, ic); - elm_slider_label_set(sl, "Vertical inverted"); + elm_object_text_set(sl, "Vertical inverted"); elm_slider_inverted_set(sl, EINA_TRUE); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 60); @@ -158,7 +158,7 @@ evas_object_smart_callback_add(sl1, "changed", _change_cb, sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Vertical"); + elm_object_text_set(sl, "Vertical"); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 60); evas_object_size_hint_align_set(sl, 0.5, EVAS_HINT_FILL); @@ -179,7 +179,7 @@ sl = elm_slider_add(win); elm_slider_icon_set(sl, ic); - elm_slider_label_set(sl, "Disabled vertical"); + elm_object_text_set(sl, "Disabled vertical"); elm_slider_inverted_set(sl, EINA_TRUE); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 100); Modified: trunk/elementary/src/bin/test_win_state.c =================================================================== --- trunk/elementary/src/bin/test_win_state.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/test_win_state.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -166,7 +166,7 @@ evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Test"); + elm_object_text_set(sl, "Test"); elm_slider_span_size_set(sl, 100); evas_object_size_hint_align_set(sl, 0.5, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -299,7 +299,7 @@ evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Override Redirect"); + elm_object_text_set(sl, "Override Redirect"); elm_slider_span_size_set(sl, 100); evas_object_size_hint_align_set(sl, 0.5, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
From: Enlightenment S. <no-...@en...> - 2011-07-04 09:18:16
|
Log: Elm actionslider: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-07-04 02:18:07 -0700 (Mon, 04 Jul 2011) New Revision: 60972 Trac: http://trac.enlightenment.org/e/changeset/60972 Modified: trunk/elementary/src/bin/test_actionslider.c Modified: trunk/elementary/src/bin/test_actionslider.c =================================================================== --- trunk/elementary/src/bin/test_actionslider.c 2011-07-04 09:18:04 UTC (rev 60971) +++ trunk/elementary/src/bin/test_actionslider.c 2011-07-04 09:18:07 UTC (rev 60972) @@ -52,7 +52,9 @@ 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_label_set(as, "left", "Snooze"); + elm_object_label_set(as, "center", NULL); + elm_object_label_set(as, "right", "Stop"); elm_actionslider_enabled_pos_set(as, ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT); evas_object_smart_callback_add(as, "pos_changed", @@ -66,7 +68,9 @@ 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_label_set(as, "left", "Snooze"); + elm_object_label_set(as, "center", NULL); + elm_object_label_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); @@ -82,7 +86,9 @@ 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_label_set(as, "left", NULL); + elm_object_label_set(as, "center", "Accept"); + elm_object_label_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); @@ -93,8 +99,10 @@ 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_label_set(as, "left", NULL); + elm_object_label_set(as, "center", "Accept"); + elm_object_label_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); @@ -107,8 +115,10 @@ 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_label_set(as, "left", "Left"); + elm_object_label_set(as, "center", "Center"); + elm_object_label_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); @@ -118,7 +128,9 @@ 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_label_set(as, "left", "Enable"); + elm_object_label_set(as, "center", "Magnet"); + elm_object_label_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); |
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); |
From: Enlightenment S. <no-...@en...> - 2011-07-11 14:46:22
|
Log: Elm test: Added a --test-win-only to not show the main list window. This is a nice workaround if you want to use the shot module to take pictures of the various tests, since the shot module doesn't behave nicely with multiple windows atm. Author: tasn Date: 2011-07-11 07:46:16 -0700 (Mon, 11 Jul 2011) New Revision: 61246 Trac: http://trac.enlightenment.org/e/changeset/61246 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-07-11 14:39:53 UTC (rev 61245) +++ trunk/elementary/src/bin/test.c 2011-07-11 14:46:16 UTC (rev 61246) @@ -187,7 +187,7 @@ static void -my_win_main(char *autorun) +my_win_main(char *autorun, Eina_Bool test_win_only) { Evas_Object *win, *bg, *bx0, *lb, *li, *idx, *fr, *tg; Eina_List *tests, *l; @@ -448,7 +448,8 @@ /* set an initial window size */ evas_object_resize(win, 320, 480); /* show the window */ - evas_object_show(win); + if (!test_win_only) + evas_object_show(win); } /* this is your elementary main function - it MUST be called IMMEDIATELY @@ -457,6 +458,7 @@ EAPI int elm_main(int argc, char **argv) { + Eina_Bool test_win_only = EINA_FALSE; char *autorun = NULL; /* tell elm about our app so it can figure out where to get files */ @@ -469,9 +471,19 @@ * ex: elementary_test "Box Vert 2" */ if (argc == 2) autorun = argv[1]; + else if (argc == 3) + { + /* Just a workaround to make the shot module more + * useful with elementary test. */ + if (!strcmp(argv[1], "--test-win-only")) + { + test_win_only = EINA_TRUE; + autorun = argv[2]; + } + } /* put here any init specific to this app like parsing args etc. */ - my_win_main(autorun); /* create main window */ + my_win_main(autorun, test_win_only); /* create main window */ elm_run(); /* and run the program now and handle all events etc. */ /* if the mainloop that elm_run() runs exist - we exit the app */ elm_shutdown(); /* clean up and shut down */ |
From: Enlightenment S. <no-...@en...> - 2011-10-18 08:58:47
|
Log: Elm glayer: Fixed leaks in glayer's test code. Author: tasn Date: 2011-10-18 01:58:41 -0700 (Tue, 18 Oct 2011) New Revision: 64142 Trac: http://trac.enlightenment.org/e/changeset/64142 Modified: trunk/elementary/src/bin/test_gesture_layer.c Modified: trunk/elementary/src/bin/test_gesture_layer.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer.c 2011-10-18 08:58:33 UTC (rev 64141) +++ trunk/elementary/src/bin/test_gesture_layer.c 2011-10-18 08:58:41 UTC (rev 64142) @@ -233,6 +233,24 @@ return EVAS_EVENT_FLAG_NONE; } +static void +_win_del_req(void *data, Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + Photo_Object **photo_array = (Photo_Object **) data; + + if (!photo_array) + return; + + /* The content of the photo object is automatically deleted when the win + * is deleted. */ + for ( ; *photo_array ; photo_array++) + free(*photo_array); + + free(data); +} + + Photo_Object * photo_object_add(Evas_Object *parent, Evas_Object *ic, const char *icon, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, int angle) @@ -303,6 +321,9 @@ Evas_Coord w, h; Evas_Object *win, *bg; char buf[PATH_MAX]; + int ind = 0; + Photo_Object **photo_array; + photo_array = calloc(sizeof(*photo_array), 4); w = 480; h = 800; @@ -319,10 +340,10 @@ evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); - snprintf(buf, sizeof(buf), "%s/images/pol_sky.png", elm_app_data_dir_get()); - photo_object_add(win, NULL, buf, 200, 200, 365, 400, 0); + snprintf(buf, sizeof(buf), "%s/images/pol_sky.png", elm_app_data_dir_get()); + photo_array[ind++] = photo_object_add(win, NULL, buf, 200, 200, 365, 400, 0); snprintf(buf, sizeof(buf), "%s/images/pol_twofish.png", elm_app_data_dir_get()); - photo_object_add(win, NULL, buf, 40, 300, 365, 400, 45); + photo_array[ind++] = photo_object_add(win, NULL, buf, 40, 300, 365, 400, 45); Evas_Object *en = elm_entry_add(win); elm_entry_entry_set(en, "You can use whatever object you want, " @@ -334,8 +355,11 @@ elm_layout_file_set(postit, buf, "main"); elm_layout_content_set(postit, "ent", en); - photo_object_add(win, postit, NULL, 50, 50, 382, 400, 355); + photo_array[ind++] = photo_object_add(win, postit, NULL, 50, 50, 382, 400, 355); + photo_array[ind] = NULL; + evas_object_smart_callback_add(win, "delete,request", _win_del_req, + photo_array); evas_object_show(win); } |
From: Enlightenment S. <no-...@en...> - 2011-10-31 16:32:19
|
Log: Elm test: Fixed label test's window size. This is actually a pretty important thing to remember. elm_win_resize_object_add resizes the content to the size of the window, the size of the window is only applied when the window is shown, at least on the ecore evas. Is that wanted? or should we take the evas-object geometry there? The problem I'm worried about is: writing beyond buffer limits. Author: tasn Date: 2011-10-31 09:32:13 -0700 (Mon, 31 Oct 2011) New Revision: 64579 Trac: http://trac.enlightenment.org/e/changeset/64579 Modified: trunk/elementary/src/bin/test_label.c Modified: trunk/elementary/src/bin/test_label.c =================================================================== --- trunk/elementary/src/bin/test_label.c 2011-10-31 16:26:52 UTC (rev 64578) +++ trunk/elementary/src/bin/test_label.c 2011-10-31 16:32:13 UTC (rev 64579) @@ -68,11 +68,10 @@ elm_box_pack_end(bx, lb); evas_object_show(lb); - elm_win_resize_object_add(win, bx); - evas_object_show(bx); - evas_object_resize(win, 320, 300); + evas_object_show(bx); evas_object_show(win); + elm_win_resize_object_add(win, bx); } #endif |
From: Enlightenment S. <no-...@en...> - 2011-11-06 09:22:53
|
Log: Elm test: Fixed gesture layer's test window size. Author: tasn Date: 2011-11-06 01:22:47 -0800 (Sun, 06 Nov 2011) New Revision: 64805 Trac: http://trac.enlightenment.org/e/changeset/64805 Modified: trunk/elementary/src/bin/test_gesture_layer.c Modified: trunk/elementary/src/bin/test_gesture_layer.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer.c 2011-11-06 09:16:00 UTC (rev 64804) +++ trunk/elementary/src/bin/test_gesture_layer.c 2011-11-06 09:22:47 UTC (rev 64805) @@ -336,8 +336,8 @@ bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/wood_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); snprintf(buf, sizeof(buf), "%s/images/pol_sky.png", elm_app_data_dir_get()); |
From: Enlightenment S. <no-...@en...> - 2011-11-06 09:22:57
|
Log: Elm test: Use momentum gesture in glayer test. Author: tasn Date: 2011-11-06 01:22:50 -0800 (Sun, 06 Nov 2011) New Revision: 64806 Trac: http://trac.enlightenment.org/e/changeset/64806 Modified: trunk/elementary/src/bin/test_gesture_layer.c Modified: trunk/elementary/src/bin/test_gesture_layer.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer.c 2011-11-06 09:22:47 UTC (rev 64805) +++ trunk/elementary/src/bin/test_gesture_layer.c 2011-11-06 09:22:50 UTC (rev 64806) @@ -173,9 +173,6 @@ po->zoom_out = NULL; } - - po->dx = p->x - po->bx; - po->dy = p->y - po->by; /* Give it a "lift" effect right from the start */ po->base_zoom = BASE_ZOOM * LIFT_FACTOR; po->zoom = po->base_zoom; @@ -192,8 +189,6 @@ Elm_Gesture_Zoom_Info *p = (Elm_Gesture_Zoom_Info *) event_info; printf("zoom move <%d,%d> <%f>\n", p->x, p->y, p->zoom); po->zoom = po->base_zoom * p->zoom; - po->bx = p->x - po->dx; - po->by = p->y - po->dy; apply_changes(po); return EVAS_EVENT_FLAG_NONE; } @@ -205,6 +200,52 @@ Elm_Gesture_Zoom_Info *p = (Elm_Gesture_Zoom_Info *) event_info; printf("zoom end/abort <%d,%d> <%f>\n", p->x, p->y, p->zoom); + /* Apply the zoom out animator */ + po->shadow_zoom = 1.3; + po->base_zoom = po->zoom; + po->zoom_out = elm_transit_add(); + elm_transit_duration_set(po->zoom_out, zoom_out_animation_duration); + elm_transit_effect_add(po->zoom_out, zoom_out_animation_operation, po, zoom_out_animation_end); + elm_transit_go(po->zoom_out); + return EVAS_EVENT_FLAG_NONE; +} + +static Evas_Event_Flags +momentum_start(void *_po, void *event_info) +{ + Photo_Object *po = (Photo_Object *) _po; + Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; + printf("momentum_start <%d,%d>\n", p->x2, p->y2); + + po->dx = p->x2 - po->bx; + po->dy = p->y2 - po->by; + apply_changes(po); + + return EVAS_EVENT_FLAG_NONE; +} + +static Evas_Event_Flags +momentum_move(void *_po, void *event_info) +{ + Photo_Object *po = (Photo_Object *) _po; + Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; + printf("momentum move <%d,%d>\n", p->x2, p->y2); + + po->bx = p->x2 - po->dx; + po->by = p->y2 - po->dy; + apply_changes(po); + + return EVAS_EVENT_FLAG_NONE; +} + +static Evas_Event_Flags +momentum_end(void *_po, void *event_info) +{ + Photo_Object *po = (Photo_Object *) _po; + Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; + printf("momentum end/abort <%d,%d> <%d,%d>\n", p->x2, p->y2, p->mx, p->my); + (void) po; + (void) p; /* Make sure middle is in the screen, if not, fix it. */ { /* FIXME: Use actual window sizes instead of the hardcoded @@ -222,14 +263,8 @@ else if (my > 800) po->by = 800 - (po->bh / 2); } + apply_changes(po); - /* Apply the zoom out animator */ - po->shadow_zoom = 1.3; - po->base_zoom = po->zoom; - po->zoom_out = elm_transit_add(); - elm_transit_duration_set(po->zoom_out, zoom_out_animation_duration); - elm_transit_effect_add(po->zoom_out, zoom_out_animation_operation, po, zoom_out_animation_end); - elm_transit_go(po->zoom_out); return EVAS_EVENT_FLAG_NONE; } @@ -306,6 +341,10 @@ elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_MOVE, zoom_move, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_END, zoom_end, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_ABORT, zoom_end, po); + elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_START, momentum_start, po); + elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_MOVE, momentum_move, po); + elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_END, momentum_end, po); + elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_ABORT, momentum_end, po); po->rotate = po->base_rotate = angle; po->shadow_zoom = 1.3; |
From: Enlightenment S. <no-...@en...> - 2011-12-08 12:39:30
|
Log: Elm test: Update tests to use the new self-closing textblock tags. Author: tasn Date: 2011-12-08 04:39:18 -0800 (Thu, 08 Dec 2011) New Revision: 66026 Trac: http://trac.enlightenment.org/e/changeset/66026 Modified: trunk/elementary/src/bin/config.c trunk/elementary/src/bin/test.c trunk/elementary/src/bin/test_anchorview.c trunk/elementary/src/bin/test_calendar.c trunk/elementary/src/bin/test_conform.c trunk/elementary/src/bin/test_entry.c trunk/elementary/src/bin/test_flip.c trunk/elementary/src/bin/test_focus.c trunk/elementary/src/bin/test_genlist.c trunk/elementary/src/bin/test_inwin.c trunk/elementary/src/bin/test_label.c trunk/elementary/src/bin/test_notify.c trunk/elementary/src/bin/test_pager.c trunk/elementary/src/bin/test_scaling.c trunk/elementary/src/bin/test_tooltip.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/config.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -628,7 +628,7 @@ elm_box_pack_end(bx, sp); evas_object_show(sp); - LABEL_FRAME_ADD("<hilight>Finger Size</><br>"); + LABEL_FRAME_ADD("<hilight>Finger Size</><br/>"); sl = elm_slider_add(win); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -1196,7 +1196,7 @@ elm_box_pack_end(bx, sp); evas_object_show(sp); - LABEL_FRAME_ADD("<hilight>Finger Size</><br>"); + LABEL_FRAME_ADD("<hilight>Finger Size</><br/>"); sl = elm_slider_add(win); evas_object_data_set(win, "fs_slider", sl); @@ -2176,7 +2176,7 @@ elm_profile_dir_free(pdir); } - snprintf(buf, sizeof(buf), "<hilight>Selected profile: %s</><br>", + snprintf(buf, sizeof(buf), "<hilight>Selected profile: %s</><br/>", prof_name); elm_object_text_set(evas_object_data_get(obj, "prof_name_lbl"), buf); @@ -2446,8 +2446,8 @@ elm_object_content_set(sc, bx); ck = elm_check_add(win); - elm_object_tooltip_text_set(ck, "Set whether scrollers should bounce<br>" - "when they reach their viewport's edge<br>" + elm_object_tooltip_text_set(ck, "Set whether scrollers should bounce<br/>" + "when they reach their viewport's edge<br/>" "during a scroll"); elm_object_text_set(ck, "Enable scroll bounce"); evas_object_data_set(win, "scroll_bounce_check", ck); @@ -2462,7 +2462,7 @@ LABEL_FRAME_ADD("<hilight>Scroll bounce friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the amount of inertia a <br>" + elm_object_tooltip_text_set(sl, "This is the amount of inertia a <br/>" "scroller will impose at bounce animations"); evas_object_data_set(win, "bounce_friction_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2486,7 +2486,7 @@ evas_object_show(sp); ck = elm_check_add(win); - elm_object_tooltip_text_set(ck, "Set whether scrollers should be<br>" + elm_object_tooltip_text_set(ck, "Set whether scrollers should be<br/>" "draggable from any point in their views"); elm_object_text_set(ck, "Enable thumb scroll"); evas_object_data_set(win, "thumbscroll_check", ck); @@ -2501,8 +2501,8 @@ LABEL_FRAME_ADD("<hilight>Thumb scroll threshold</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the number of pixels one should<br>" - "travel while dragging a scroller's view<br>" + elm_object_tooltip_text_set(sl, "This is the number of pixels one should<br/>" + "travel while dragging a scroller's view<br/>" "to actually trigger scrolling"); evas_object_data_set(win, "thumbscroll_threshold_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2521,9 +2521,9 @@ LABEL_FRAME_ADD("<hilight>Thumb scroll momentum threshold</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the minimum speed of mouse <br>" - "cursor movement which will trigger<br>" - "list self scrolling animation after a<br>" + elm_object_tooltip_text_set(sl, "This is the minimum speed of mouse <br/>" + "cursor movement which will trigger<br/>" + "list self scrolling animation after a<br/>" "mouse up event (pixels/second)"); evas_object_data_set(win, "ts_momentum_threshold_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2543,8 +2543,8 @@ LABEL_FRAME_ADD("<hilight>Thumb scroll friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the amount of inertia a<br>" - "scroller will impose at self scrolling<br>" + elm_object_tooltip_text_set(sl, "This is the amount of inertia a<br/>" + "scroller will impose at self scrolling<br/>" "animations"); evas_object_data_set(win, "thumbscroll_friction_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2563,10 +2563,10 @@ LABEL_FRAME_ADD("<hilight>Thumb scroll border friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the amount of lag between your<br>" - "actual mouse cursor dragging movement<br>" - "and a scroller's view movement itself,<br>" - "while pushing it into bounce state<br>" + elm_object_tooltip_text_set(sl, "This is the amount of lag between your<br/>" + "actual mouse cursor dragging movement<br/>" + "and a scroller's view movement itself,<br/>" + "while pushing it into bounce state<br/>" "manually"); evas_object_data_set(win, "ts_border_friction_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2585,8 +2585,8 @@ LABEL_FRAME_ADD("<hilight>Thumb scroll sensitivity friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the sensitivity amount which<br>" - "is be multiplied by the length of mouse<br>" + elm_object_tooltip_text_set(sl, "This is the sensitivity amount which<br/>" + "is be multiplied by the length of mouse<br/>" "dragging."); evas_object_data_set(win, "ts_sensitivity_friction_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2612,8 +2612,8 @@ LABEL_FRAME_ADD("<hilight>Page scroll friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the amount of inertia a<br>" - "paged scroller will impose at<br>" + elm_object_tooltip_text_set(sl, "This is the amount of inertia a<br/>" + "paged scroller will impose at<br/>" "page fitting animations"); evas_object_data_set(win, "page_scroll_friction_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2632,8 +2632,8 @@ LABEL_FRAME_ADD("<hilight>Bring in scroll friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the amount of inertia a<br>" - "scroller will impose at region bring<br>" + elm_object_tooltip_text_set(sl, "This is the amount of inertia a<br/>" + "scroller will impose at region bring<br/>" "animations"); evas_object_data_set(win, "bring_in_scroll_friction_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); @@ -2652,9 +2652,9 @@ LABEL_FRAME_ADD("<hilight>Zoom scroll friction</>"); sl = elm_slider_add(win); - elm_object_tooltip_text_set(sl, "This is the amount of inertia<br>" - "scrollers will impose at animations<br>" - "triggered by Elementary widgets'<br>" + elm_object_tooltip_text_set(sl, "This is the amount of inertia<br/>" + "scrollers will impose at animations<br/>" + "triggered by Elementary widgets'<br/>" "zooming API"); evas_object_data_set(win, "zoom_scroll_friction_slider", sl); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0); Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -268,8 +268,8 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "Please select a test from the list below<br>" - "by clicking the test button to show the<br>" + "Please select a test from the list below<br/>" + "by clicking the test button to show the<br/>" "test window."); elm_object_content_set(fr, lb); evas_object_show(lb); Modified: trunk/elementary/src/bin/test_anchorview.c =================================================================== --- trunk/elementary/src/bin/test_anchorview.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_anchorview.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -88,12 +88,12 @@ elm_anchorview_hover_style_set(av, "popout"); elm_anchorview_hover_parent_set(av, win); elm_object_text_set(av, - "This is an entry widget in this window that<br>" - "uses markup <b>like this</> for styling and<br>" - "formatting <em>like this</>, as well as<br>" - "<a href=X><link>links in the text</></a>, so enter text<br>" - "in here to edit it. By the way, links are<br>" - "called <a href=anc-02>Anchors</a> so you will need<br>" + "This is an entry widget in this window that<br/>" + "uses markup <b>like this</> for styling and<br/>" + "formatting <em>like this</>, as well as<br/>" + "<a href=X><link>links in the text</></a>, so enter text<br/>" + "in here to edit it. By the way, links are<br/>" + "called <a href=anc-02>Anchors</a> so you will need<br/>" "to refer to them this way. <item relsize=16x16 vsize=full href=emoticon/guilty-smile></item>"); evas_object_size_hint_weight_set(av, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_smart_callback_add(av, "anchor,clicked", my_anchorview_anchor, av); Modified: trunk/elementary/src/bin/test_calendar.c =================================================================== --- trunk/elementary/src/bin/test_calendar.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_calendar.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -46,9 +46,9 @@ wds = elm_calendar_weekdays_names_get(cal); snprintf(info, sizeof(info), - " Day: %i, Mon: %i, Year %i, WeekDay: %i<br>" - " Interval: %0.2f, Year_Min: %i, Year_Max %i, Sel Enabled : %i<br>" - " Weekdays: %s, %s, %s, %s, %s, %s, %s<br>", + " Day: %i, Mon: %i, Year %i, WeekDay: %i<br/>" + " Interval: %0.2f, Year_Min: %i, Year_Max %i, Sel Enabled : %i<br/>" + " Weekdays: %s, %s, %s, %s, %s, %s, %s<br/>", stime.tm_mday, stime.tm_mon, stime.tm_year + 1900, stime.tm_wday, interval, year_min, year_max, sel_enabled, wds[0], wds[1], wds[2], wds[3], wds[4], wds[5], wds[6]); Modified: trunk/elementary/src/bin/test_conform.c =================================================================== --- trunk/elementary/src/bin/test_conform.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_conform.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -66,7 +66,7 @@ elm_entry_scrollable_set(en, EINA_TRUE); elm_entry_bounce_set(en, 0, 1); elm_entry_entry_set(en, - "This is a multi-line entry at the bottom<br>" + "This is a multi-line entry at the bottom<br/>" "This can contain more than 1 line of text and be " "scrolled around to allow for entering of lots of " "content. It is also to test to see that autoscroll " Modified: trunk/elementary/src/bin/test_entry.c =================================================================== --- trunk/elementary/src/bin/test_entry.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_entry.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -97,26 +97,26 @@ en = elm_entry_add(win); elm_entry_line_wrap_set(en, ELM_WRAP_NONE); snprintf(buf, sizeof(buf), - "This is an entry widget in this window that<br>" - "uses markup <b>like this</> for styling and<br>" - "formatting <em>like this</>, as well as<br>" - "<a href=X><link>links in the text</></a>, so enter text<br>" - "in here to edit it. By the way, links are<br>" - "called <a href=anc-02>Anchors</a> so you will need<br>" - "to refer to them this way.<br>" - "<br>" + "This is an entry widget in this window that<br/>" + "uses markup <b>like this</> for styling and<br/>" + "formatting <em>like this</>, as well as<br/>" + "<a href=X><link>links in the text</></a>, so enter text<br/>" + "in here to edit it. By the way, links are<br/>" + "called <a href=anc-02>Anchors</a> so you will need<br/>" + "to refer to them this way.<br/>" + "<br/>" "Also you can stick in items with (relsize + ascent): " "<item relsize=16x16 vsize=ascent href=emoticon/evil-laugh></item>" " (full) " "<item relsize=16x16 vsize=full href=emoticon/guilty-smile></item>" - " (to the left)<br>" + " (to the left)<br/>" "Also (size + ascent): " "<item size=16x16 vsize=ascent href=emoticon/haha></item>" " (full) " "<item size=16x16 vsize=full href=emoticon/happy-panting></item>" - " (before this)<br>" + " (before this)<br/>" "And as well (absize + ascent): " "<item absize=64x64 vsize=ascent href=emoticon/knowing-grin></item>" @@ -328,9 +328,9 @@ elm_entry_context_menu_item_add(en, "Hello", NULL, ELM_ICON_NONE, NULL, NULL); elm_entry_context_menu_item_add(en, "World", NULL, ELM_ICON_NONE, NULL, NULL); elm_entry_entry_set(en, - "Multi-line disabled entry widget :)<br>" - "We can use markup <b>like this</> for styling and<br>" - "formatting <em>like this</>, as well as<br>" + "Multi-line disabled entry widget :)<br/>" + "We can use markup <b>like this</> for styling and<br/>" + "formatting <em>like this</>, as well as<br/>" "<a href=X><link>links in the text</></a>," "but it won't be editable or clickable."); evas_object_show(en); @@ -455,12 +455,12 @@ evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); elm_entry_entry_set(en, - "This is an entry widget in this window that<br>" - "uses markup <b>like this</> for styling and<br>" - "formatting <em>like this</>, as well as<br>" - "<a href=X><link>links in the text</></a>, so enter text<br>" - "in here to edit it. By them way, links are<br>" - "called <a href=anc-02>Anchors</a> so you will need<br>" + "This is an entry widget in this window that<br/>" + "uses markup <b>like this</> for styling and<br/>" + "formatting <em>like this</>, as well as<br/>" + "<a href=X><link>links in the text</></a>, so enter text<br/>" + "in here to edit it. By them way, links are<br/>" + "called <a href=anc-02>Anchors</a> so you will need<br/>" "to refer to them this way. At the end here is a really long " "line to test line wrapping to see if it works. But just in " "case this line is not long enough I will add more here to " @@ -1002,12 +1002,12 @@ evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_entry_entry_set(en, - "This is an entry widget in this window that<br>" - "uses markup <b>like this</> for styling and<br>" - "formatting <em>like this</>, as well as<br>" - "<a href=X><link>links in the text</></a>, so enter text<br>" - "in here to edit it. By them way, links are<br>" - "called <a href=anc-02>Anchors</a> so you will need<br>" + "This is an entry widget in this window that<br/>" + "uses markup <b>like this</> for styling and<br/>" + "formatting <em>like this</>, as well as<br/>" + "<a href=X><link>links in the text</></a>, so enter text<br/>" + "in here to edit it. By them way, links are<br/>" + "called <a href=anc-02>Anchors</a> so you will need<br/>" "to refer to them this way. At the end here is a really long " "line to test line wrapping to see if it works. But just in " "case this line is not long enough I will add more here to " @@ -1311,10 +1311,10 @@ en = elm_entry_add(win); elm_entry_line_wrap_set(en, ELM_WRAP_NONE); elm_entry_entry_set(en, - "This is an entry widget<br>" - "that uses markup<br>" - "<b>like this</> and has<br>" - "no scroller, so you can<br>" + "This is an entry widget<br/>" + "that uses markup<br/>" + "<b>like this</> and has<br/>" + "no scroller, so you can<br/>" "use it more flexibly."); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -1326,12 +1326,12 @@ evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_entry_entry_set(en, - "This is an entry widget in this window that<br>" - "uses markup <b>like this</> for styling and<br>" - "formatting <em>like this</>, as well as<br>" - "<a href=X><link>links in the text</></a>, so enter text<br>" - "in here to edit it. By them way, links are<br>" - "called <a href=anc-02>Anchors</a> so you will need<br>" + "This is an entry widget in this window that<br/>" + "uses markup <b>like this</> for styling and<br/>" + "formatting <em>like this</>, as well as<br/>" + "<a href=X><link>links in the text</></a>, so enter text<br/>" + "in here to edit it. By them way, links are<br/>" + "called <a href=anc-02>Anchors</a> so you will need<br/>" "to refer to them this way. At the end here is a really long " "line to test line wrapping to see if it works. But just in " "case this line is not long enough I will add more here to " Modified: trunk/elementary/src/bin/test_flip.c =================================================================== --- trunk/elementary/src/bin/test_flip.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_flip.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -271,26 +271,26 @@ elm_entry_scrollable_set(en, EINA_TRUE); elm_entry_line_wrap_set(en, ELM_WRAP_NONE); snprintf(buf, sizeof(buf), - "This is an entry widget in this window that<br>" - "uses markup <b>like this</> for styling and<br>" - "formatting <em>like this</>, as well as<br>" - "<a href=X><link>links in the text</></a>, so enter text<br>" - "in here to edit it. By the way, links are<br>" - "called <a href=anc-02>Anchors</a> so you will need<br>" - "to refer to them this way.<br>" - "<br>" + "This is an entry widget in this window that<br/>" + "uses markup <b>like this</> for styling and<br/>" + "formatting <em>like this</>, as well as<br/>" + "<a href=X><link>links in the text</></a>, so enter text<br/>" + "in here to edit it. By the way, links are<br/>" + "called <a href=anc-02>Anchors</a> so you will need<br/>" + "to refer to them this way.<br/>" + "<br/>" "Also you can stick in items with (relsize + ascent): " "<item relsize=16x16 vsize=ascent href=emoticon/evil-laugh></item>" " (full) " "<item relsize=16x16 vsize=full href=emoticon/guilty-smile></item>" - " (to the left)<br>" + " (to the left)<br/>" "Also (size + ascent): " "<item size=16x16 vsize=ascent href=emoticon/haha></item>" " (full) " "<item size=16x16 vsize=full href=emoticon/happy-panting></item>" - " (before this)<br>" + " (before this)<br/>" "And as well (absize + ascent): " "<item absize=64x64 vsize=ascent href=emoticon/knowing-grin></item>" Modified: trunk/elementary/src/bin/test_focus.c =================================================================== --- trunk/elementary/src/bin/test_focus.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_focus.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -91,7 +91,7 @@ { Evas_Object *lb = elm_label_add(win); elm_object_text_set(lb, - "<b>Use Tab, Shift+Tab, and<br>" + "<b>Use Tab, Shift+Tab, and<br/>" "Arrow Keys</b>" ); evas_object_size_hint_weight_set(lb, 0.0, 0.0); Modified: trunk/elementary/src/bin/test_genlist.c =================================================================== --- trunk/elementary/src/bin/test_genlist.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_genlist.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -1742,7 +1742,7 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "Sweep genlist items to the right.<br>" + "Sweep genlist items to the right.<br/>" "Test this by changing Mode Type to Slide or Rotate."); elm_box_pack_end(bx2, lb); evas_object_show(lb); @@ -1854,7 +1854,7 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "Enable reorder mode if you want to move item.<br>" + "Enable reorder mode if you want to move item.<br/>" "Then long press and drag item."); elm_object_content_set(fr, lb); evas_object_show(lb); Modified: trunk/elementary/src/bin/test_inwin.c =================================================================== --- trunk/elementary/src/bin/test_inwin.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_inwin.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -22,10 +22,10 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is an \"inwin\" - a window in a<br>" - "window. This is handy for quick popups<br>" - "you want centered, taking over the window<br>" - "until dismissed somehow. Unlike hovers they<br>" + "This is an \"inwin\" - a window in a<br/>" + "window. This is handy for quick popups<br/>" + "you want centered, taking over the window<br/>" + "until dismissed somehow. Unlike hovers they<br/>" "don't hover over their target."); elm_win_inwin_content_set(inwin, lb); evas_object_show(lb); @@ -54,13 +54,13 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is an \"inwin\" - a window in a<br>" - "window. This is handy for quick popups<br>" - "you want centered, taking over the window<br>" - "until dismissed somehow. Unlike hovers they<br>" - "don't hover over their target.<br>" - "<br>" - "This inwin style compacts itself vertically<br>" + "This is an \"inwin\" - a window in a<br/>" + "window. This is handy for quick popups<br/>" + "you want centered, taking over the window<br/>" + "until dismissed somehow. Unlike hovers they<br/>" + "don't hover over their target.<br/>" + "<br/>" + "This inwin style compacts itself vertically<br/>" "to the size of its contents minimum size."); elm_win_inwin_content_set(inwin, lb); evas_object_show(lb); Modified: trunk/elementary/src/bin/test_label.c =================================================================== --- trunk/elementary/src/bin/test_label.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_label.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -33,10 +33,10 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is a larger label with newlines<br>" - "to make it bigger, bit it won't expand or wrap<br>" - "just be a block of text that can't change its<br>" - "formatting as it's fixed based on text<br>" + "This is a larger label with newlines<br/>" + "to make it bigger, bit it won't expand or wrap<br/>" + "just be a block of text that can't change its<br/>" + "formatting as it's fixed based on text<br/>" ); evas_object_size_hint_weight_set(lb, 0.0, 0.0); evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, EVAS_HINT_FILL); Modified: trunk/elementary/src/bin/test_notify.c =================================================================== --- trunk/elementary/src/bin/test_notify.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_notify.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -95,7 +95,7 @@ evas_object_show(bx); lb = elm_label_add(win); - elm_object_text_set(lb, "Bottom position. This notify use a timeout of 5 sec.<br>" + elm_object_text_set(lb, "Bottom position. This notify use a timeout of 5 sec.<br/>" "<b>The events outside the window are blocked.</b>"); elm_box_pack_end(bx, lb); evas_object_show(lb); Modified: trunk/elementary/src/bin/test_pager.c =================================================================== --- trunk/elementary/src/bin/test_pager.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_pager.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -98,17 +98,17 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 1 in a pager stack.<br>" - "<br>" - "So what is a pager stack? It is a stack<br>" - "of pages that hold widgets in it. The<br>" - "pages can be pushed and popped on and<br>" - "off the stack, activated and otherwise<br>" - "activated if already in the stack<br>" - "(activated means promoted to the top of<br>" - "the stack).<br>" - "<br>" - "The theme may define the animation how<br>" + "This is page 1 in a pager stack.<br/>" + "<br/>" + "So what is a pager stack? It is a stack<br/>" + "of pages that hold widgets in it. The<br/>" + "pages can be pushed and popped on and<br/>" + "off the stack, activated and otherwise<br/>" + "activated if already in the stack<br/>" + "(activated means promoted to the top of<br/>" + "the stack).<br/>" + "<br/>" + "The theme may define the animation how<br/>" "show and hide of pages. Select one theme style:"); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -150,9 +150,9 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 2 in a pager stack.<br>" - "<br>" - "This is just like the previous page in<br>" + "This is page 2 in a pager stack.<br/>" + "<br/>" + "This is just like the previous page in<br/>" "the pager stack." ); elm_box_pack_end(bx, lb); @@ -178,9 +178,9 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 3 in a pager stack.<br>" - "<br>" - "This is just like the previous page in<br>" + "This is page 3 in a pager stack.<br/>" + "<br/>" + "This is just like the previous page in<br/>" "the pager stack."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -250,7 +250,7 @@ evas_object_show(bx); lb = elm_label_add(info->win); - snprintf(buf, sizeof(buf), "This is page %d in the slide pager<br><br>", count++); + snprintf(buf, sizeof(buf), "This is page %d in the slide pager<br/><br/>", count++); elm_object_text_set(lb, buf); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -308,14 +308,14 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 1 in a slide pager.<br>" - "<br>" - "The slide pager style is useful for browsing<br>" - "a hierarchy of objects, as it makes clear<br>" - "the direction of the browse.<br>" - "This is the 'slide' style, also available<br>" - "a fully transparent style named 'slide_invisble'.<br>" - "<br>"); + "This is page 1 in a slide pager.<br/>" + "<br/>" + "The slide pager style is useful for browsing<br/>" + "a hierarchy of objects, as it makes clear<br/>" + "the direction of the browse.<br/>" + "This is the 'slide' style, also available<br/>" + "a fully transparent style named 'slide_invisble'.<br/>" + "<br/>"); elm_box_pack_end(bx, lb); evas_object_show(lb); Modified: trunk/elementary/src/bin/test_scaling.c =================================================================== --- trunk/elementary/src/bin/test_scaling.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_scaling.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -86,8 +86,8 @@ elm_object_text_set(fr, "Scale: 0.5"); lb = elm_label_add(win); elm_object_text_set(lb, - "Parent frame scale<br>" - "is 0.5. Child should<br>" + "Parent frame scale<br/>" + "is 0.5. Child should<br/>" "inherit it."); elm_object_content_set(fr, lb); evas_object_show(lb); @@ -98,8 +98,8 @@ elm_object_text_set(fr, "Scale: 1.0"); lb = elm_label_add(win); elm_object_text_set(lb, - "Parent frame scale<br>" - "is 1.0. Child should<br>" + "Parent frame scale<br/>" + "is 1.0. Child should<br/>" "inherit it."); elm_object_content_set(fr, lb); evas_object_show(lb); @@ -111,8 +111,8 @@ elm_object_text_set(fr, "Scale: 2.0"); lb = elm_label_add(win); elm_object_text_set(lb, - "Parent frame scale<br>" - "is 2.0. Child should<br>" + "Parent frame scale<br/>" + "is 2.0. Child should<br/>" "inherit it."); elm_object_content_set(fr, lb); evas_object_show(lb); Modified: trunk/elementary/src/bin/test_tooltip.c =================================================================== --- trunk/elementary/src/bin/test_tooltip.c 2011-12-08 12:08:53 UTC (rev 66025) +++ trunk/elementary/src/bin/test_tooltip.c 2011-12-08 12:39:18 UTC (rev 66026) @@ -169,9 +169,9 @@ void *item __UNUSED__) { Evas_Object *l = elm_label_add(tt); - elm_object_text_set(l, "Something useful here?<ps>" - "No probably not, but this is a super long label<ps>" - "which probably breaks on your system, now doesn't it?<ps>" + elm_object_text_set(l, "Something useful here?<ps/>" + "No probably not, but this is a super long label<ps/>" + "which probably breaks on your system, now doesn't it?<ps/>" "Yeah, I thought so."); elm_label_line_wrap_set(l, ELM_WRAP_MIXED); return l; @@ -351,7 +351,7 @@ { elm_object_text_set(obj, "Locked tooltip visibility"); elm_object_tooltip_text_set(obj, "This tooltip is locked" - " visible,<br> click the button" + " visible,<br/> click the button" " to unlock!"); elm_object_tooltip_show(obj); } @@ -359,7 +359,7 @@ { elm_object_text_set(obj, "Unlocked tooltip visibility"); elm_object_tooltip_text_set(obj, "This tooltip is unlocked" - " visible,<br> click the button" + " visible,<br/> click the button" " to lock!"); elm_object_tooltip_hide(obj); } @@ -466,7 +466,7 @@ bt = elm_button_add(win); elm_object_text_set(bt, "Unlocked tooltip visibility"); - elm_object_tooltip_text_set(bt, "This tooltip is unlocked visible,<br>" + elm_object_tooltip_text_set(bt, "This tooltip is unlocked visible,<br/>" " click the button to lock!"); evas_object_smart_callback_add(bt, "clicked", _tt_visible_lock_toggle, NULL); |
From: Enlightenment S. <no-...@en...> - 2011-12-21 08:48:06
|
Log: elementary: Added gesture Layer Momentum test (test_gesture_layer3) Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2011-12-21 00:47:56 -0800 (Wed, 21 Dec 2011) New Revision: 66424 Trac: http://trac.enlightenment.org/e/changeset/66424 Added: trunk/elementary/src/bin/test_gesture_layer3.c Modified: trunk/elementary/src/bin/Makefile.am trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/Makefile.am =================================================================== --- trunk/elementary/src/bin/Makefile.am 2011-12-21 08:47:53 UTC (rev 66423) +++ trunk/elementary/src/bin/Makefile.am 2011-12-21 08:47:56 UTC (rev 66424) @@ -64,6 +64,7 @@ test_genlist.c \ test_gesture_layer.c \ test_gesture_layer2.c \ +test_gesture_layer3.c \ test_glview_simple.c \ test_glview.c \ test_grid.c \ Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-12-21 08:47:53 UTC (rev 66423) +++ trunk/elementary/src/bin/test.c 2011-12-21 08:47:56 UTC (rev 66424) @@ -75,6 +75,7 @@ void test_genlist12(void *data, Evas_Object *obj, void *event_info); void test_gesture_layer(void *data, Evas_Object *obj, void *event_info); void test_gesture_layer2(void *data, Evas_Object *obj, void *event_info); +void test_gesture_layer3(void *data, Evas_Object *obj, void *event_info); void test_table(void *data, Evas_Object *obj, void *event_info); void test_table2(void *data, Evas_Object *obj, void *event_info); void test_table3(void *data, Evas_Object *obj, void *event_info); @@ -414,6 +415,7 @@ //------------------------------// ADD_TEST(NULL, "Input", "Gesture Layer", test_gesture_layer); ADD_TEST(NULL, "Input", "Gesture Layer 2", test_gesture_layer2); + ADD_TEST(NULL, "Input", "Gesture Layer 3", test_gesture_layer3); ADD_TEST(NULL, "Input", "Multi Touch", test_multi); //------------------------------// |
From: Enlightenment S. <no-...@en...> - 2011-12-21 08:48:14
|
Log: Elementary: fixed momentum value for zoom test. Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2011-12-21 00:48:03 -0800 (Wed, 21 Dec 2011) New Revision: 66426 Trac: http://trac.enlightenment.org/e/changeset/66426 Modified: trunk/elementary/src/bin/test_gesture_layer3.c Modified: trunk/elementary/src/bin/test_gesture_layer3.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer3.c 2011-12-21 08:48:00 UTC (rev 66425) +++ trunk/elementary/src/bin/test_gesture_layer3.c 2011-12-21 08:48:03 UTC (rev 66426) @@ -316,7 +316,7 @@ p->zoom, p->momentum); /* Apply the zoom-momentum or zoom out animator */ - po->zoom_dx = p->zoom / (zoom_momentum_animation_duration * 1000); + po->zoom_dx = p->momentum / (zoom_momentum_animation_duration * 1000); if (po->zoom_dx) { po->zoom_momentum = elm_transit_add(); |
From: Enlightenment S. <no-...@en...> - 2011-12-21 08:48:29
|
Log: GLayer: Updated test to work with new momentum values Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2011-12-21 00:48:19 -0800 (Wed, 21 Dec 2011) New Revision: 66430 Trac: http://trac.enlightenment.org/e/changeset/66430 Modified: trunk/elementary/src/bin/test_gesture_layer3.c Modified: trunk/elementary/src/bin/test_gesture_layer3.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer3.c 2011-12-21 08:48:16 UTC (rev 66429) +++ trunk/elementary/src/bin/test_gesture_layer3.c 2011-12-21 08:48:19 UTC (rev 66430) @@ -6,16 +6,23 @@ /* We zoom out to this value so we'll be able to use map and have a nice * resolution when zooming in. */ -#define BASE_ZOOM 0.5 +#define BASE_ZOOM 0.8 /* The amount of zoom to do when "lifting" objects. */ #define LIFT_FACTOR 1.3 /* The base size of the shadow image. */ #define SHADOW_W 118 #define SHADOW_H 118 -#define RAD2DEG(x) ((x) * 57.295779513) +//#define RAD2DEG(x) ((x) * 57.295779513) -static double zoom_momentum_animation_duration = 0.4; +#define MOMENTUM_FRICTION 2000 +#define ROTATE_MOMENTUM_FRICTION 30 +#define ZOOM_MOMENTUM_FRICTION 8 +#define TIMER_TICK 0.1 +#define ROTATE_MOMENTUM_FRICTION 30 +#define ZOOM_MOMENTUM_FRICTION 8 +#define TIMER_TICK 0.1 + struct _Photo_Object { Evas_Object *ic, *shadow; Evas_Object *hit; @@ -24,7 +31,9 @@ /* 3 transit object to implement momentum animation */ Elm_Transit *momentum; Elm_Transit *zoom_momentum; - Elm_Transit *rot_momentum; + Ecore_Timer *rot_timer; + double rot_tot_time; + double rot_progress; /* bx, by - current wanted coordinates of the photo object. * bw, bh - original size of the "ic" object. * dx, dy - Used to indicate the distance between the center point @@ -37,7 +46,7 @@ * per gesture, we have to keep the current rotate/zoom factor and the * one that was before we started the gesture. */ int base_rotate, rotate; /* base - initial angle */ - double r_momentum; + double rot_momentum; double base_zoom, zoom, zoom_dx; /* zoom_dx used for zoom-momentum */ double shadow_zoom; }; @@ -127,7 +136,6 @@ { Photo_Object *po = (Photo_Object *) _po; po->zoom += po->zoom_dx; - printf("%s po->zoom=<%f>\n",__func__, po->zoom); apply_changes(po); } @@ -139,30 +147,44 @@ } /* Rotate momentum animation */ -static void -rotate_momentum_animation_operation(void *_po, Elm_Transit *transit __UNUSED__, - double progress) +static Eina_Bool +rotate_momentum_animation_operation(void *_po) { - printf("%s progress=<%f>\n", __func__, progress); + Eina_Bool rc = ECORE_CALLBACK_RENEW; + int deg_friction = ROTATE_MOMENTUM_FRICTION; Photo_Object *po = (Photo_Object *) _po; - po->rotate = po->base_rotate + RAD2DEG(po->r_momentum * progress); + po->rot_progress += TIMER_TICK; + if (po->rot_progress > po->rot_tot_time) + { + po->rot_timer = NULL; + po->rot_progress = po->rot_tot_time; + rc = ECORE_CALLBACK_CANCEL; + } + + if (po->rot_momentum > 0) + deg_friction *= -1; + + /* Current = rot0 + (rotv0 * t) + (a * t^2 / 2) */ + po->rotate = po->base_rotate - + ((po->rot_momentum * po->rot_progress) + + (deg_friction * (po->rot_progress * po->rot_progress) / 2)); + po->rotate = (po->rotate % 360); if (po->rotate < 0) - po->rotate = (po->rotate % 360) + 360; - printf("current-angle=<%d> base-angle=<%d> momentum-angle=<%d>\n", - po->rotate, po->base_rotate, - (int) RAD2DEG(po->r_momentum * progress)); + po->rotate += 360; + printf("%d = %d - (%f + %f)\n", po->rotate, po->base_rotate, + (po->rot_momentum * po->rot_progress), + (deg_friction * (po->rot_progress * po->rot_progress) / 2)); + if (rc == ECORE_CALLBACK_CANCEL) + { + po->base_rotate = po->rotate; + printf("%s po->rotate=<%d>\n", __func__, po->rotate); + } + apply_changes(po); + return rc; } -static void -rotate_momentum_animation_end(void *_po, Elm_Transit *transit __UNUSED__) -{ - Photo_Object *po = (Photo_Object *) _po; - - po->rot_momentum = NULL; -} - /* Momentum animation */ static void momentum_animation_operation(void *_po, Elm_Transit *transit __UNUSED__, @@ -211,14 +233,15 @@ { Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Rotate_Info *p = (Elm_Gesture_Rotate_Info *) event_info; - printf("rotate start <%d,%d> base=<%f> <%f>\n", p->x, p->y, - RAD2DEG(p->base_angle), RAD2DEG(p->angle)); + printf("rotate start <%d,%d> po->rotate=<%d> base=<%f> p->angle=<%f>\n", p->x, p->y, po->rotate, + p->base_angle, p->angle); /* If there's an active animator, stop it */ - if (po->rot_momentum) + if (po->rot_timer) { - elm_transit_del(po->rot_momentum); - po->rot_momentum = NULL; + po->base_rotate = po->rotate; + ecore_timer_del(po->rot_timer); + po->rot_timer = NULL; } return EVAS_EVENT_FLAG_NONE; @@ -230,8 +253,9 @@ Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Rotate_Info *p = (Elm_Gesture_Rotate_Info *) event_info; printf("rotate move <%d,%d> base=<%f> <%f> m=<%f>\n", p->x, p->y, - RAD2DEG(p->base_angle), RAD2DEG(p->angle), p->momentum); - po->rotate = po->base_rotate + (int) RAD2DEG(p->base_angle - p->angle); + p->base_angle, p->angle, p->momentum); + po->rotate = po->base_rotate + (int) (p->angle - p->base_angle); + if (po->rotate < 0) po->rotate += 360; apply_changes(po); @@ -244,23 +268,19 @@ Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Rotate_Info *r_info = (Elm_Gesture_Rotate_Info *) event_info; printf("rotate end <%d,%d> base=<%f> <%f> m=<%f>\n", r_info->x, r_info->y, - RAD2DEG(r_info->base_angle), RAD2DEG(r_info->angle), r_info->momentum); - po->base_rotate += (int) RAD2DEG(r_info->base_angle - r_info->angle); + r_info->base_angle, r_info->angle, r_info->momentum); if (po->rotate < 0) po->rotate += 360; + po->base_rotate = po->rotate; + /* Apply the rotate-momentum */ - double tot_time = fabs(r_info->momentum) / 8; - po->r_momentum = r_info->momentum * tot_time - (8 * tot_time * tot_time) / 2; - if (po->r_momentum) + po->rot_tot_time = fabs(r_info->momentum) / ROTATE_MOMENTUM_FRICTION; + po->rot_momentum = r_info->momentum; + po->rot_progress = 0.0; + if (po->rot_momentum) { - po->rot_momentum = elm_transit_add(); - printf("TOM %f\n", tot_time); - elm_transit_duration_set(po->rot_momentum, tot_time); - elm_transit_effect_add(po->rot_momentum, - rotate_momentum_animation_operation, po, - rotate_momentum_animation_end); - elm_transit_go(po->rot_momentum); + po->rot_timer = ecore_timer_add(TIMER_TICK, rotate_momentum_animation_operation, po); } return EVAS_EVENT_FLAG_NONE; } @@ -271,8 +291,8 @@ Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Rotate_Info *p = (Elm_Gesture_Rotate_Info *) event_info; printf("rotate abort <%d,%d> base=<%f> <%f>\n", p->x, p->y, - RAD2DEG(p->base_angle), RAD2DEG(p->angle)); - po->base_rotate += (int) RAD2DEG(p->base_angle - p->angle); + p->base_angle, p->angle); + po->base_rotate = po->rotate; if (po->rotate < 0) po->rotate += 360; @@ -301,7 +321,7 @@ { Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Zoom_Info *p = (Elm_Gesture_Zoom_Info *) event_info; - printf("zoom move <%d,%d> <%f>\n", p->x, p->y, p->zoom); + printf("zoom move <%d,%d> <%f> momentum=<%f>\n", p->x, p->y, p->zoom, p->momentum); po->zoom = po->base_zoom * p->zoom; apply_changes(po); return EVAS_EVENT_FLAG_NONE; @@ -316,18 +336,20 @@ p->zoom, p->momentum); /* Apply the zoom-momentum or zoom out animator */ - po->zoom_dx = p->momentum / (zoom_momentum_animation_duration * 1000); + double tot_time = fabs(p->momentum) / ZOOM_MOMENTUM_FRICTION; + po->zoom_dx = (p->momentum * tot_time + (ZOOM_MOMENTUM_FRICTION * tot_time * tot_time) / 2) - po->base_zoom; if (po->zoom_dx) { po->zoom_momentum = elm_transit_add(); elm_transit_duration_set(po->zoom_momentum, - zoom_momentum_animation_duration); + tot_time); elm_transit_effect_add(po->zoom_momentum, zoom_momentum_animation_operation, po, zoom_momentum_animation_end); elm_transit_go(po->zoom_momentum); } + po->base_zoom = po->zoom; return EVAS_EVENT_FLAG_NONE; } @@ -336,7 +358,7 @@ { Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; - printf("momentum_start <%d,%d>\n", p->x2, p->y2); + printf("momentum_start po->rotate=<%d> <%d,%d>\n", po->rotate, p->x2, p->y2); /* If there's an active animator, stop it */ if (po->momentum) @@ -371,14 +393,17 @@ { Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; - printf("momentum end <%d,%d> <%d,%d>\n", p->x2, p->y2, p->mx, p->my); + printf("momentum end po->rotate=<%d> <%d,%d> <%d,%d>\n", po->rotate, p->x2, p->y2, p->mx, p->my); pic_obj_keep_inframe(po); apply_changes(po); po->m_dx = p->mx / 200; po->m_dy = p->my / 200; po->momentum = elm_transit_add(); - elm_transit_duration_set(po->momentum, 0.5); + double tot_time = sqrt((p->mx * p->mx) + (p->my * p->my)) + / MOMENTUM_FRICTION; + printf("%s tot_time=<%f>\n", __func__, tot_time); + elm_transit_duration_set(po->momentum, tot_time); elm_transit_effect_add(po->momentum, momentum_animation_operation, po, momentum_animation_end); elm_transit_go(po->momentum); @@ -463,6 +488,7 @@ elm_gesture_layer_attach(po->gl, po->hit); /* FIXME: Add a po->rotate start so we take the first angle!!!! */ + /* elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_START, momentum_start, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, @@ -471,7 +497,7 @@ ELM_GESTURE_STATE_END, momentum_end, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_ABORT, momentum_abort, po); - +*/ elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_START, zoom_start, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, @@ -480,7 +506,7 @@ ELM_GESTURE_STATE_END, zoom_end, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_ABORT, zoom_end, po); - +/* elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_START, rotate_start, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, @@ -489,7 +515,7 @@ ELM_GESTURE_STATE_END, rotate_end, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_ABORT, rotate_abort, po); - +*/ po->rotate = po->base_rotate = angle; po->shadow_zoom = 1.3; |
From: Enlightenment S. <no-...@en...> - 2011-12-21 08:48:31
|
Log: Elm glayer: fixed zoom momentum in glayer momentum test. Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2011-12-21 00:48:22 -0800 (Wed, 21 Dec 2011) New Revision: 66431 Trac: http://trac.enlightenment.org/e/changeset/66431 Modified: trunk/elementary/src/bin/test_gesture_layer3.c Modified: trunk/elementary/src/bin/test_gesture_layer3.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer3.c 2011-12-21 08:48:19 UTC (rev 66430) +++ trunk/elementary/src/bin/test_gesture_layer3.c 2011-12-21 08:48:22 UTC (rev 66431) @@ -7,6 +7,7 @@ /* We zoom out to this value so we'll be able to use map and have a nice * resolution when zooming in. */ #define BASE_ZOOM 0.8 +#define MIN_ZOOM 0.4 /* The amount of zoom to do when "lifting" objects. */ #define LIFT_FACTOR 1.3 /* The base size of the shadow image. */ @@ -19,10 +20,6 @@ #define ZOOM_MOMENTUM_FRICTION 8 #define TIMER_TICK 0.1 -#define ROTATE_MOMENTUM_FRICTION 30 -#define ZOOM_MOMENTUM_FRICTION 8 -#define TIMER_TICK 0.1 - struct _Photo_Object { Evas_Object *ic, *shadow; Evas_Object *hit; @@ -46,8 +43,9 @@ * per gesture, we have to keep the current rotate/zoom factor and the * one that was before we started the gesture. */ int base_rotate, rotate; /* base - initial angle */ - double rot_momentum; - double base_zoom, zoom, zoom_dx; /* zoom_dx used for zoom-momentum */ + double rot_momentum, zoom_mom; + double zoom_mom_time; + double base_zoom, zoom; double shadow_zoom; }; typedef struct _Photo_Object Photo_Object; @@ -132,10 +130,26 @@ /* Zoom momentum animation */ static void zoom_momentum_animation_operation(void *_po, Elm_Transit *transit __UNUSED__, - double progress __UNUSED__) + double progress) { Photo_Object *po = (Photo_Object *) _po; - po->zoom += po->zoom_dx; + double time_prog = po->zoom_mom_time * progress; + double zoom_fric = ZOOM_MOMENTUM_FRICTION; + + if (po->zoom_mom > 0) + zoom_fric *= -1; + + /* Current = rot0 + (rotv0 * t) + (a * t^2 / 2) */ + po->zoom = po->base_zoom + + ((po->zoom_mom * time_prog) + + (zoom_fric * (time_prog * time_prog) / 2)); + printf("%f = %f + (%f + %f)\n", po->zoom, po->base_zoom, + (po->zoom_mom * time_prog), + (zoom_fric * (time_prog * time_prog) / 2)); + + if (po->zoom < MIN_ZOOM) + po->zoom = MIN_ZOOM; + apply_changes(po); } @@ -143,6 +157,7 @@ zoom_momentum_animation_end(void *_po, Elm_Transit *transit __UNUSED__) { Photo_Object *po = (Photo_Object *) _po; + po->base_zoom = po->zoom; po->zoom_momentum = NULL; } @@ -337,8 +352,10 @@ /* Apply the zoom-momentum or zoom out animator */ double tot_time = fabs(p->momentum) / ZOOM_MOMENTUM_FRICTION; - po->zoom_dx = (p->momentum * tot_time + (ZOOM_MOMENTUM_FRICTION * tot_time * tot_time) / 2) - po->base_zoom; - if (po->zoom_dx) + po->zoom_mom_time = tot_time; + po->zoom_mom = p->momentum; + po->base_zoom = po->zoom; + if (po->zoom_mom) { po->zoom_momentum = elm_transit_add(); elm_transit_duration_set(po->zoom_momentum, @@ -349,7 +366,6 @@ elm_transit_go(po->zoom_momentum); } - po->base_zoom = po->zoom; return EVAS_EVENT_FLAG_NONE; } @@ -488,7 +504,6 @@ elm_gesture_layer_attach(po->gl, po->hit); /* FIXME: Add a po->rotate start so we take the first angle!!!! */ - /* elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_START, momentum_start, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, @@ -497,7 +512,7 @@ ELM_GESTURE_STATE_END, momentum_end, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_MOMENTUM, ELM_GESTURE_STATE_ABORT, momentum_abort, po); -*/ + elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_START, zoom_start, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, @@ -506,7 +521,7 @@ ELM_GESTURE_STATE_END, zoom_end, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_ABORT, zoom_end, po); -/* + elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_START, rotate_start, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, @@ -515,7 +530,7 @@ ELM_GESTURE_STATE_END, rotate_end, po); elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_ABORT, rotate_abort, po); -*/ + po->rotate = po->base_rotate = angle; po->shadow_zoom = 1.3; |
From: Enlightenment S. <no-...@en...> - 2012-01-01 12:30:52
|
Log: Elm test glayer: Added momentum support on x,y axis Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2012-01-01 04:30:46 -0800 (Sun, 01 Jan 2012) New Revision: 66715 Trac: http://trac.enlightenment.org/e/changeset/66715 Modified: trunk/elementary/src/bin/test_gesture_layer3.c Modified: trunk/elementary/src/bin/test_gesture_layer3.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer3.c 2012-01-01 12:22:16 UTC (rev 66714) +++ trunk/elementary/src/bin/test_gesture_layer3.c 2012-01-01 12:30:46 UTC (rev 66715) @@ -15,7 +15,8 @@ #define SHADOW_H 118 //#define RAD2DEG(x) ((x) * 57.295779513) -#define MOMENTUM_FRICTION 2000 +#define MOMENTUM_FACTOR 30 +#define MOMENTUM_FRICTION 1000 #define ROTATE_MOMENTUM_FRICTION 30 #define ZOOM_MOMENTUM_FRICTION 8 #define TIMER_TICK 0.1 @@ -26,9 +27,9 @@ Evas_Object *gl; /* 3 transit object to implement momentum animation */ - Elm_Transit *momentum; Elm_Transit *zoom_momentum; Ecore_Timer *rot_timer; + Ecore_Timer *mom_timer; double rot_tot_time; double rot_progress; /* bx, by - current wanted coordinates of the photo object. @@ -43,7 +44,10 @@ * per gesture, we have to keep the current rotate/zoom factor and the * one that was before we started the gesture. */ int base_rotate, rotate; /* base - initial angle */ + double mx, my; /* momentum on x, y */ + double mom_x_acc, mom_y_acc; double rot_momentum, zoom_mom; + double mom_tot_time; double zoom_mom_time; double base_zoom, zoom; double shadow_zoom; @@ -200,18 +204,7 @@ return rc; } -/* Momentum animation */ static void -momentum_animation_operation(void *_po, Elm_Transit *transit __UNUSED__, - double progress __UNUSED__) -{ - Photo_Object *po = (Photo_Object *) _po; - po->bx += po->m_dx; - po->by += po->m_dy; - apply_changes(po); -} - -static void pic_obj_keep_inframe(void *_po) { /* Make sure middle is in the screen, if not, fix it. */ /* FIXME: Use actual window sizes instead of the hardcoded @@ -232,17 +225,6 @@ po->by = 800 - (po->bh / 2); } -static void -momentum_animation_end(void *_po, Elm_Transit *transit __UNUSED__) -{ - Photo_Object *po = (Photo_Object *) _po; - - pic_obj_keep_inframe(po); - apply_changes(po); - - po->momentum = NULL; -} - static Evas_Event_Flags rotate_start(void *_po, void *event_info) { @@ -377,10 +359,10 @@ printf("momentum_start po->rotate=<%d> <%d,%d>\n", po->rotate, p->x2, p->y2); /* If there's an active animator, stop it */ - if (po->momentum) + if (po->mom_timer) { - elm_transit_del(po->momentum); - po->momentum = NULL; + ecore_timer_del(po->mom_timer); + po->mom_timer = NULL; } po->dx = p->x2 - po->bx; @@ -404,25 +386,57 @@ return EVAS_EVENT_FLAG_NONE; } +/* Momentum animation */ +static Eina_Bool +momentum_animation_operation(void *_po) +{ + Photo_Object *po = (Photo_Object *) _po; + Eina_Bool rc = ECORE_CALLBACK_RENEW; + Evas_Coord x = po->bx; + Evas_Coord y = po->by; + po->mom_tot_time -= TIMER_TICK; + if (po->mom_tot_time <= 0) + { + po->mom_timer = NULL; + rc = ECORE_CALLBACK_CANCEL; + } + + /* x = v0t + 0.5at^2 */ + po->bx += ((po->mx * po->mom_tot_time) + + (0.5 * po->mom_x_acc * (po->mom_tot_time * po->mom_tot_time))); + + po->by += ((po->my * po->mom_tot_time) + + (0.5 * po->mom_y_acc * (po->mom_tot_time * po->mom_tot_time))); + + printf("%s prev_bx-new_bx,y=(%d,%d)\n", __func__, x-po->bx, y-po->by); + if (rc == ECORE_CALLBACK_CANCEL) + pic_obj_keep_inframe(po); + + apply_changes(po); + return rc; +} + static Evas_Event_Flags momentum_end(void *_po, void *event_info) { Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; - printf("momentum end po->rotate=<%d> <%d,%d> <%d,%d>\n", po->rotate, p->x2, p->y2, p->mx, p->my); + printf("momentum end x2,y2=<%d,%d> mx,my=<%d,%d>\n", p->x2, p->y2, p->mx, p->my); pic_obj_keep_inframe(po); apply_changes(po); - po->m_dx = p->mx / 200; - po->m_dy = p->my / 200; + /* Make up some total-time for the movement */ + po->mom_tot_time = sqrt((p->mx * p->mx) + (p->my * p->my)) + / MOMENTUM_FRICTION; - po->momentum = elm_transit_add(); - double tot_time = sqrt((p->mx * p->mx) + (p->my * p->my)) - / MOMENTUM_FRICTION; - printf("%s tot_time=<%f>\n", __func__, tot_time); - elm_transit_duration_set(po->momentum, tot_time); - elm_transit_effect_add(po->momentum, momentum_animation_operation, po, - momentum_animation_end); - elm_transit_go(po->momentum); + if (po->mom_tot_time) + { /* Compute acceleration for both compenents, and launch timer */ + po->mom_x_acc = (p->mx) / po->mom_tot_time; /* a = (v-v0) / t */ + po->mom_y_acc = (p->my) / po->mom_tot_time; /* a = (v-v0) / t */ + po->mom_x_acc /= MOMENTUM_FACTOR; + po->mom_y_acc /= MOMENTUM_FACTOR; + po->mom_timer = ecore_timer_add(TIMER_TICK, momentum_animation_operation, po); + } + return EVAS_EVENT_FLAG_NONE; } |
From: Enlightenment S. <no-...@en...> - 2012-02-23 13:58:01
|
Log: Elementary: Fixed debug printf to use momentum Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2012-02-23 05:57:50 -0800 (Thu, 23 Feb 2012) New Revision: 68317 Trac: http://trac.enlightenment.org/e/changeset/68317 Modified: trunk/elementary/src/bin/test_gesture_layer3.c Modified: trunk/elementary/src/bin/test_gesture_layer3.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer3.c 2012-02-23 11:46:51 UTC (rev 68316) +++ trunk/elementary/src/bin/test_gesture_layer3.c 2012-02-23 13:57:50 UTC (rev 68317) @@ -377,7 +377,7 @@ { Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; - printf("momentum move <%d,%d>\n", p->x2, p->y2); + printf("momentum move <%d,%d> fingers=<%d> mx,my=<%d,%d>\n", p->x2, p->y2, p->n, p->mx, p->my); po->bx = p->x2 - po->dx; po->by = p->y2 - po->dy; |
From: Enlightenment S. <no-...@en...> - 2012-02-23 13:58:07
|
Log: elementary: Fixed memory leak when using --test-win-only Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2012-02-23 05:57:54 -0800 (Thu, 23 Feb 2012) New Revision: 68318 Trac: http://trac.enlightenment.org/e/changeset/68318 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2012-02-23 13:57:50 UTC (rev 68317) +++ trunk/elementary/src/bin/test.c 2012-02-23 13:57:54 UTC (rev 68318) @@ -560,8 +560,14 @@ } tt = t; - if (test_win_only) return; + if (test_win_only) + { + EINA_LIST_FREE(tests, t) + free (t); + return; + } + if (tests) { const char *pcat = NULL; |
From: Enlightenment S. <no-...@en...> - 2012-02-23 13:58:07
|
Log: elementary: Added infra for API testing in elementary_test Signed-off-by: Aharon Hillel <a.h...@pa...> Author: tasn Date: 2012-02-23 05:57:56 -0800 (Thu, 23 Feb 2012) New Revision: 68319 Trac: http://trac.enlightenment.org/e/changeset/68319 Added: trunk/elementary/src/bin/test.h Modified: trunk/elementary/src/bin/Makefile.am trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/Makefile.am =================================================================== --- trunk/elementary/src/bin/Makefile.am 2012-02-23 13:57:54 UTC (rev 68318) +++ trunk/elementary/src/bin/Makefile.am 2012-02-23 13:57:56 UTC (rev 68319) @@ -112,7 +112,8 @@ test_win_inline.c \ test_win_socket.c \ test_win_plug.c \ -test_win_state.c +test_win_state.c \ +test.h if HAVE_EIO elementary_test_SOURCES += test_eio.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2012-02-23 13:57:54 UTC (rev 68318) +++ trunk/elementary/src/bin/test.c 2012-02-23 13:57:56 UTC (rev 68319) @@ -1,4 +1,5 @@ #include <Elementary.h> +#include "test.h" #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif @@ -198,10 +199,9 @@ *p_list = eina_list_sorted_insert(*p_list, elm_test_sort, t); } -static void +void my_win_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - /* called when my_win_main is requested to be deleted */ elm_exit(); /* exit the program's main loop that runs in elm_run() */ } |