livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed allow_html to parse_urls to be clearer about its meaning 

allow_html still supported as alternate
master
Richard Linden 2010-07-15 10:20:06 -07:00
parent b46fff1ba1
commit 2fb2efe2a2
34 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/lldraghandle.cpp
View File

@ -113,7 +113,7 @@ void LLDragHandleTop::setTitle(const std::string& title)
params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT);
params.font_shadow(LLFontGL::DROP_SHADOW_SOFT);
params.use_ellipses = true;
params.allow_html = false; //cancel URL replacement in floater title
params.parse_urls = false; //cancel URL replacement in floater title
mTitleBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild( mTitleBox );
}

5
indra/llui/lltextbase.cpp
View File

@ -167,11 +167,12 @@ LLTextBase::Params::Params()
font_shadow("font_shadow"),
wrap("wrap"),
use_ellipses("use_ellipses", false),
allow_html("allow_html", false),
parse_urls("parse_urls", false),
parse_highlights("parse_highlights", false)
{
addSynonym(track_end, "track_bottom");
addSynonym(wrap, "word_wrap");
addSynonym(parse_urls, "allow_html");
}
@ -209,7 +210,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
mPlainText ( p.plain_text ),
mWordWrap(p.wrap),
mUseEllipses( p.use_ellipses ),
mParseHTML(p.allow_html),
mParseHTML(p.parse_urls),
mParseHighlights(p.parse_highlights),
mBGVisible(p.bg_visible),
mScroller(NULL),

2
indra/llui/lltextbase.h
View File

@ -251,7 +251,7 @@ public:
plain_text,
wrap,
use_ellipses,
allow_html,
parse_urls,
parse_highlights,
clip_partial;

2
indra/llui/lltooltip.cpp
View File

@ -186,7 +186,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
params.font = p.font;
params.use_ellipses = true;
params.wrap = p.wrap;
params.allow_html = false; // disallow hyperlinks in tooltips, as they want to spawn their own explanatory tooltips
params.parse_urls = false; // disallow hyperlinks in tooltips, as they want to spawn their own explanatory tooltips
mTextBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild(mTextBox);

2
indra/newview/llfolderview.cpp
View File

@ -250,7 +250,7 @@ LLFolderView::LLFolderView(const Params& p)
text_p.name(std::string(p.name));
text_p.font(font);
text_p.visible(false);
text_p.allow_html(true);
text_p.parse_urls(true);
text_p.wrap(true); // allow multiline text. See EXT-7564, EXT-7047
// set text padding the same as in People panel. EXT-7047, EXT-4837
text_p.h_pad(STATUS_TEXT_HPAD);

2
indra/newview/skins/default/xui/en/floater_aaa.xml
View File

@ -21,7 +21,7 @@
<string name="test_the_vlt">This string CHANGE2 is extracted.</string>
<string name="testing_eli">Just a test. changes.</string>
<chat_history
allow_html="true"
parse_urls="true"
bg_readonly_color="ChatHistoryBgColor"
bg_writeable_color="ChatHistoryBgColor"
border_visible="false"

2
indra/newview/skins/default/xui/en/floater_about.xml
View File

@ -73,7 +73,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number
help_topic="about_support_tab"
name="support_panel">
<text_editor
allow_html="true"
parse_urls="true"
follows="top|left"
font="SansSerif"
height="343"

2
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -67,7 +67,7 @@
height="150"
name="chat_history"
parse_highlights="true"
allow_html="true"
parse_urls="true"
left="1"
width="249">
</chat_history>

2
indra/newview/skins/default/xui/en/floater_nearby_chat.xml
View File

@ -25,7 +25,7 @@
single_instance="true"
width="320">
<chat_history
allow_html="true"
parse_urls="true"
bg_readonly_color="ChatHistoryBgColor"
bg_writeable_color="ChatHistoryBgColor"
follows="all"

2
indra/newview/skins/default/xui/en/floater_preview_notecard.xml
View File

@ -71,7 +71,7 @@
left="4"
max_length="65536"
name="Notecard Editor"
allow_html="false"
parse_urls="false"
tab_group="1"
top="46"
width="392"

2
indra/newview/skins/default/xui/en/inspect_object.xml
View File

@ -26,7 +26,7 @@ Owner [OWNER]
<string name="Touch">Touch</string>
<string name="Sit">Sit</string>
<text
allow_html="false"
parse_urls="false"
follows="all"
font="SansSerifLarge"
height="30"

2
indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
View File

@ -41,7 +41,7 @@
height="16"
layout="topleft"
left_pad="5"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/panel_chat_header.xml
View File

@ -21,7 +21,7 @@
top="3"
width="18" />
<text
allow_html="false"
parse_urls="false"
allow_scroll="false"
v_pad = "7"
read_only = "true"

4
indra/newview/skins/default/xui/en/panel_classified_info.xml
View File

@ -201,7 +201,7 @@
value="Category:"
width="140" />
<text_editor
allow_html="true"
parse_urls="true"
allow_scroll="false"
bg_visible="false"
follows="left|top|right"
@ -370,7 +370,7 @@
value="Description:"
width="250" />
<text_editor
allow_html="true"
parse_urls="true"
allow_scroll="true"
bg_visible="false"
follows="all"

2
indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
View File

@ -53,7 +53,7 @@
height="16"
layout="topleft"
left_pad="5"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
View File

@ -53,7 +53,7 @@
height="16"
layout="topleft"
left_pad="5"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
View File

@ -42,7 +42,7 @@
height="16"
layout="topleft"
left_pad="5"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="LtGray_50"

2
indra/newview/skins/default/xui/en/panel_group_list_item.xml
View File

@ -36,7 +36,7 @@
top="2"
width="20" />
<text
allow_html="false"
parse_urls="false"
follows="left|right"
font="SansSerifSmall"
height="15"

2
indra/newview/skins/default/xui/en/panel_group_notify.xml
View File

@ -50,7 +50,7 @@
width="230" />
</panel>
<text_editor
allow_html="true"
parse_urls="true"
enabled="true"
follows="all"
height="0"

2
indra/newview/skins/default/xui/en/panel_inventory_item.xml
View File

@ -41,7 +41,7 @@
height="20"
layout="topleft"
left_pad="5"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/panel_landmark_info.xml
View File

@ -236,7 +236,7 @@
value="Title:"
width="290" />
<text
allow_html="false"
parse_urls="false"
follows="left|top"
height="22"
layout="topleft"

2
indra/newview/skins/default/xui/en/panel_notification.xml
View File

@ -78,7 +78,7 @@
width="285"
wrap="true"
parse_highlights="true"
allow_html="true"/>
parse_urls="true"/>
</panel>
<panel
background_visible="false"

2
indra/newview/skins/default/xui/en/panel_pick_info.xml
View File

@ -100,7 +100,7 @@
follows="all"
height="100"
width="280"
allow_html="true"
parse_urls="true"
hide_scrollbar="false"
layout="topleft"
left="10"

4
indra/newview/skins/default/xui/en/panel_place_profile.xml
View File

@ -264,7 +264,7 @@
</layout_panel>
</layout_stack>
<text
allow_html="false"
parse_urls="false"
follows="left|top|right"
font="SansSerifLarge"
height="14"
@ -277,7 +277,7 @@
value="SampleRegion"
width="290" />
<text
allow_html="false"
parse_urls="false"
follows="left|top|right"
height="14"
layout="topleft"

2
indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
View File

@ -41,7 +41,7 @@
height="20"
layout="topleft"
left_pad="5"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="region"
text_color="white"

2
indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
View File

@ -21,7 +21,7 @@
height="16"
layout="topleft"
left="21"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
View File

@ -21,7 +21,7 @@
height="16"
layout="topleft"
left="42"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
View File

@ -33,7 +33,7 @@
height="16"
layout="topleft"
left="45"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
View File

@ -22,7 +22,7 @@
height="16"
layout="topleft"
left="41"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="LtGray_50"

2
indra/newview/skins/default/xui/en/widgets/expandable_text.xml
View File

@ -2,7 +2,7 @@
<expandable_text
max_height="300" >
<textbox
allow_html="true"
parse_urls="true"
allow_scroll="true"
bg_visible="false"
label="More"

2
indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
View File

@ -32,7 +32,7 @@
height="20"
layout="topleft"
left="21"
allow_html="false"
parse_urls="false"
use_ellipses="true"
name="item_name"
text_color="white"

2
indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<simple_text_editor
allow_html="false"
parse_urls="false"
mouse_opaque="true"
font="SansSerifSmall"
max_length="255"

2
indra/newview/skins/default/xui/en/widgets/text.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<text allow_html="true"
<text parse_urls="true"
mouse_opaque="false"
name="text_box"
font="SansSerifSmall"

2
indra/newview/skins/default/xui/en/widgets/text_editor.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Core parameters are in simple_text_editor.xml -->
<text_editor
allow_html="false"
parse_urls="false"
show_context_menu="true"/>