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); |