X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2Ftest_win_inline.c;h=a8aed99783de21ea36bf6d9e46668db710f93a99;hb=HEAD;hp=5c46a201f6fa32fb14500da9d41b608622e76a5a;hpb=2987aee91b2e331a3cc29e26f450fe468e33e3d2;p=framework%2Fuifw%2Felementary.git diff --git a/src/bin/test_win_inline.c b/src/bin/test_win_inline.c index 5c46a20..a8aed99 100644 --- a/src/bin/test_win_inline.c +++ b/src/bin/test_win_inline.c @@ -1,7 +1,7 @@ -#include #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif +#include #ifndef ELM_LIB_QUICKLAUNCH static void @@ -26,107 +26,109 @@ fill(Evas_Object *win, Eina_Bool do_bg) evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); - en = elm_scrolled_entry_add(win); + en = elm_entry_add(win); + elm_entry_scrollable_set(en, EINA_TRUE); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); - elm_scrolled_entry_entry_set(en, "This is a single line"); - elm_scrolled_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); - elm_scrolled_entry_single_line_set(en, 1); + elm_object_text_set(en, "This is a single line"); + elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_entry_single_line_set(en, EINA_TRUE); evas_object_show(en); elm_box_pack_end(bx, en); - - en = elm_scrolled_entry_add(win); + + en = elm_entry_add(win); + elm_entry_scrollable_set(en, EINA_TRUE); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); - elm_scrolled_entry_entry_set(en, "Entry 2"); - elm_scrolled_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); - elm_scrolled_entry_single_line_set(en, 1); + elm_object_text_set(en, "Entry 2"); + elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_entry_single_line_set(en, EINA_TRUE); evas_object_show(en); elm_box_pack_end(bx, en); - + ic = elm_icon_add(win); - snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); - elm_icon_scale_set(ic, 0, 0); + elm_icon_resizable_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 3"); - elm_bubble_info_set(bb, "10:32 4/11/2008"); - elm_bubble_icon_set(bb, ic); + elm_object_text_set(bb, "Message 3"); + elm_object_part_text_set(bb, "info", "10:32 4/11/2008"); + elm_object_part_content_set(bb, "icon", ic); 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); - av = elm_anchorblock_add(win); - elm_anchorblock_hover_style_set(av, "popout"); - elm_anchorblock_hover_parent_set(av, win); - elm_anchorblock_text_set(av, - "Hi there. This is the most recent message in the " - "list of messages. It has one +61 432 1234 " - "(phone number) to click on."); - elm_bubble_content_set(bb, av); + av = elm_entry_add(win); + elm_entry_anchor_hover_style_set(av, "popout"); + elm_entry_anchor_hover_parent_set(av, win); + elm_object_text_set(av, + "Hi there. This is the most recent message in the " + "list of messages. It has one +61 432 1234 " + "(phone number) to click on."); + elm_object_content_set(bb, av); evas_object_show(av); 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); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 2"); - elm_bubble_info_set(bb, "7:16 27/10/2008"); - elm_bubble_icon_set(bb, ic); + elm_object_text_set(bb, "Message 2"); + elm_object_part_text_set(bb, "info", "7:16 27/10/2008"); + elm_object_part_content_set(bb, "icon", ic); 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); - av = elm_anchorblock_add(win); - elm_anchorblock_hover_style_set(av, "popout"); - elm_anchorblock_hover_parent_set(av, win); - elm_anchorblock_text_set(av, - "Hey what are you doing? This is the second last message " - "Hi there. This is the most recent message in the " - "list. It's a longer one so it can wrap more and " - "contains a John contact " - "link in it to test popups on links. The idea is that " - "all SMS's are scanned for things that look like phone " - "numbers or names that are in your contacts list, and " - "if they are, they become clickable links that pop up " - "a menus of obvious actions to perform on this piece " - "of information. This of course can be later explicitly " - "done by links maybe running local apps or even being " - "web URL's too that launch the web browser and point it " - "to that URL. "); - elm_bubble_content_set(bb, av); + av = elm_entry_add(win); + elm_entry_anchor_hover_style_set(av, "popout"); + elm_entry_anchor_hover_parent_set(av, win); + elm_object_text_set(av, + "Hey what are you doing? This is the second last message " + "Hi there. This is the most recent message in the " + "list. It's a longer one so it can wrap more and " + "contains a John contact " + "link in it to test popups on links. The idea is that " + "all SMS's are scanned for things that look like phone " + "numbers or names that are in your contacts list, and " + "if they are, they become clickable links that pop up " + "a menus of obvious actions to perform on this piece " + "of information. This of course can be later explicitly " + "done by links maybe running local apps or even being " + "web URL's too that launch the web browser and point it " + "to that URL. "); + elm_object_content_set(bb, av); evas_object_show(av); 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); + snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); - elm_icon_scale_set(ic, 0, 0); + elm_icon_resizable_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 1"); - elm_bubble_info_set(bb, "20:47 18/6/2008"); - elm_bubble_icon_set(bb, ic); + elm_object_text_set(bb, "Message 1"); + elm_object_part_text_set(bb, "info", "20:47 18/6/2008"); + elm_object_part_content_set(bb, "icon", ic); 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); - av = elm_anchorblock_add(win); - elm_anchorblock_hover_style_set(av, "popout"); - elm_anchorblock_hover_parent_set(av, win); - elm_anchorblock_text_set(av, "This is a short message. "); - elm_bubble_content_set(bb, av); + av = elm_entry_add(win); + elm_entry_anchor_hover_style_set(av, "popout"); + elm_entry_anchor_hover_parent_set(av, win); + elm_object_text_set(av, "This is a short message. "); + elm_object_content_set(bb, av); evas_object_show(av); elm_box_pack_end(bx, bb); evas_object_show(bb); - elm_scroller_content_set(sc, bx); + elm_object_content_set(sc, bx); evas_object_show(bx); evas_object_show(sc); @@ -144,8 +146,8 @@ cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_i if (!ev->buttons) return; evas_object_geometry_get(obj, &x, &y, NULL, NULL); evas_object_move(obj, - x + (ev->cur.output.x - ev->prev.output.x), - y + (ev->cur.output.y - ev->prev.output.y)); + x + (ev->cur.canvas.x - ev->prev.output.x), + y + (ev->cur.canvas.y - ev->prev.output.y)); evas_object_image_size_get(orig, &w, &h); p = evas_map_new(4); evas_object_map_enable_set(orig, EINA_TRUE); @@ -186,7 +188,7 @@ create_handles(Evas_Object *obj) hand = evas_object_image_filled_add(evas_object_evas_get(obj)); evas_object_resize(hand, 31, 31); - snprintf(buf, sizeof(buf), "%s/images/pt.png", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/pt.png", elm_app_data_dir_get()); evas_object_image_file_set(hand, buf, NULL); if (i == 0) evas_object_move(hand, x - 15, y - 15); else if (i == 1) evas_object_move(hand, x + w - 15, y - 15); @@ -207,10 +209,10 @@ test_win_inline(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ win = elm_win_add(NULL, "window-inline", ELM_WIN_BASIC); elm_win_title_set(win, "Window Inline"); - elm_win_autodel_set(win, 1); + elm_win_autodel_set(win, EINA_TRUE); bg = elm_bg_add(win); - snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR); + snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); elm_bg_file_set(bg, buf, NULL); elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);