diff options
author | Erica Olsen <erica@lindenlab.com> | 2009-09-25 01:21:05 +0000 |
---|---|---|
committer | Erica Olsen <erica@lindenlab.com> | 2009-09-25 01:21:05 +0000 |
commit | b323c24dcad12cafb2ef962dc487dcae59095b1a (patch) | |
tree | c1f2918241d3b6089ec19fa1540fb44037005960 /indra/newview/skins | |
parent | 7eca974a11cba4c4ed0bc89bccb937b044770c29 (diff) |
EXT-1145 Update layout of Buy/Pay/Open floaters
Diffstat (limited to 'indra/newview/skins')
5 files changed, 219 insertions, 229 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index 8d27ae894b..718f83c9a2 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="300" + height="290" layout="topleft" min_height="150" min_width="200" @@ -22,27 +22,29 @@ name="no_transfer_text"> (no transfer) </floater.string> - <text + <text type="string" length="1" follows="left|top|right" font="SansSerif" height="16" + top="22" + left="10" layout="topleft" - left="15" name="contains_text" - top="24" - width="281"> + width="276"> [NAME] contains: </text> <scroll_list - follows="left|top|right|bottom" - height="148" + background_visible="true" + draw_border="false" + follows="all" + height="163" layout="topleft" - left_delta="0" + left="10" name="item_list" top_pad="4" - width="250"> + width="260"> <scroll_list.columns name="icon" width="16" /> @@ -53,43 +55,42 @@ <text type="string" length="1" - follows="left|right|bottom" + follows="left|top" font="SansSerif" - height="24" + height="16" layout="topleft" - left_delta="0" + left="10" name="buy_text" - top_pad="4" - width="281"> + text_color="white" + top="220" + width="260"> Buy for L$[AMOUNT] from [NAME]? </text> <check_box - follows="left|bottom" - height="20" + follows="left|top" + height="16" label="Wear clothing now" layout="topleft" - left_delta="0" + left="10" name="wear_check" - top="224" - width="135" /> + width="250" /> <button follows="right|bottom" - height="20" + height="23" label="Buy" label_selected="Buy" layout="topleft" - left_delta="0" + left="65" name="buy_btn" - top_pad="10" - width="125" /> + top_pad="5" + width="100" /> <button follows="right|bottom" - height="20" + height="23" label="Cancel" label_selected="Cancel" layout="topleft" left_pad="5" name="cancel_btn" - top_delta="0" - width="125" /> + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml index 0b4684e8ba..7930622e54 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="250" + height="290" layout="topleft" - min_height="175" - min_width="154" + min_height="150" + min_width="200" name="contents" help_topic="contents" save_rect="true" @@ -32,13 +32,15 @@ (no transfer) </floater.string> <scroll_list + background_visible="true" + draw_border="false" follows="left|top|right" - height="36" + height="35" layout="topleft" - left="15" name="object_list" - top="24" - width="250"> + top="20" + left="10" + width="260"> <scroll_list.columns name="icon" width="16" /> @@ -49,24 +51,26 @@ <text type="string" length="1" - follows="left|top|right" + follows="all" font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="10" name="contents_text" - top_pad="4" - width="250"> - and its contents: + top_pad="5" + width="260"> + Contains: </text> <scroll_list - follows="left|top|right|bottom" - height="108" + background_visible="true" + draw_border="false" + follows="all" + height="145" layout="topleft" left_delta="0" name="item_list" top_pad="4" - width="250"> + width="260"> <scroll_list.columns name="icon" width="16" /> @@ -79,32 +83,33 @@ length="1" follows="left|right|bottom" font="SansSerif" - height="24" + height="16" layout="topleft" left_delta="0" name="buy_text" - top_pad="4" - width="281"> + text_color="white" + top_pad="5" + width="276"> Buy for L$[AMOUNT] from [NAME]? </text> <button follows="right|bottom" - height="20" + height="23" label="Buy" label_selected="Buy" layout="topleft" - left="10" + left="65" name="buy_btn" - top_pad="5" - width="125" /> + top_pad="10" + width="100" /> <button follows="right|bottom" - height="20" + height="23" label="Cancel" label_selected="Cancel" layout="topleft" left_pad="5" name="cancel_btn" top_delta="0" - width="125" /> + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml index ef6124b3ad..17f7e9bf67 100644 --- a/indra/newview/skins/default/xui/en/floater_openobject.xml +++ b/indra/newview/skins/default/xui/en/floater_openobject.xml @@ -11,38 +11,41 @@ save_rect="true" title="Object Contents" width="300"> - <panel_inventory - follows="left|top|right|bottom" - height="276" - layout="topleft" - left="8" - name="object_contents" - top="44" - width="284" /> - <text + <text type="string" length="1" follows="left|top|right" font="SansSerif" + text_color="White" height="16" layout="topleft" - left_delta="0" + left="10" name="object_name" - top_delta="-20" + top="20" width="284"> [DESC]: </text> + <panel_inventory + background_visible="false" + draw_border="false" + follows="all" + height="276" + layout="topleft" + left="10" + name="object_contents" + top_pad="0" + width="284" /> <button follows="bottom|left" font="SansSerifSmall" - height="20" + height="23" label="Copy To Inventory" label_selected="Copy To Inventory" layout="topleft" - left_delta="2" + left="20" name="copy_to_inventory_button" tab_group="1" - top_pad="285" + top_pad="5" width="120"> <button.commit_callback function="OpenObject.MoveToInventory" /> @@ -50,13 +53,12 @@ <button follows="bottom|left" font="SansSerifSmall" - height="20" + height="23" label="Copy And Wear" label_selected="Copy And Wear" layout="topleft" left_pad="10" name="copy_and_wear_button" - top_delta="0" width="120"> <button.commit_callback function="OpenObject.MoveAndWear" /> diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml index ac5e4592b7..5f70f09a34 100644 --- a/indra/newview/skins/default/xui/en/floater_pay.xml +++ b/indra/newview/skins/default/xui/en/floater_pay.xml @@ -1,130 +1,119 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_minimize="false" - height="140" + height="185" layout="topleft" name="Give Money" help_topic="give_money" save_rect="true" - width="300"> + width="225"> + <text + type="string" + length="1" + follows="left|top" + font="SansSerifBold" + height="18" + layout="topleft" + left="12" + name="payee_label" + top="7" + width="75"> + Pay: + </text> + <icon + height="16" + width="16" + image_name="Generic_Person" + mouse_opaque="true" + name="icon_person" + tool_tip="Person" + top_pad="0" + left="10" + /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="7" + name="payee_name" + width="210"> + [FIRST] [LAST] + </text> <button - height="20" + height="23" label="L$1" label_selected="L$1" layout="topleft" - left="108" + left="25" name="fastpay 1" - top="54" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$5" label_selected="L$5" layout="topleft" left_pad="15" name="fastpay 5" - top_delta="0" width="80" /> <button - height="20" + height="23" label="L$10" label_selected="L$10" layout="topleft" - left="108" + left="25" name="fastpay 10" - top="78" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$20" label_selected="L$20" layout="topleft" left_pad="15" name="fastpay 20" - top_delta="0" - width="80" /> - <button - enabled="false" - height="20" - label="Pay" - label_selected="Pay" - layout="topleft" - left="120" - name="pay btn" - top="112" - width="80" /> - <button - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - left_pad="3" - name="cancel btn" - top_delta="0" width="80" /> <text type="string" length="1" follows="left|top" - font="SansSerif" height="18" layout="topleft" - left="12" - name="payee_label" - top="7" - width="75"> - Pay resident: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="18" - layout="topleft" - left_delta="73" - name="payee_name" - top_delta="0" - width="210"> - [FIRST] [LAST] - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - halign="right" - height="18" - layout="topleft" - left="5" - name="fastpay text" - top="54" - width="95"> - Fast Pay: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="18" - layout="topleft" - left="12" + left="25" name="amount text" - top="112" - width="75"> - Amount: + top_pad="8" + width="180"> + Or, choose amount: </text> <line_editor border_style="line" - border_thickness="1" follows="left|top|right" - font="SansSerif" - height="18" + height="19" + top_pad="0" layout="topleft" - left_delta="46" + left="120" max_length="9" name="amount" - top_delta="0" - width="57" /> + width="80" /> + <button + enabled="false" + height="23" + label="Pay" + label_selected="Pay" + layout="topleft" + left="10" + name="pay btn" + top_pad="5" + width="100" /> + <button + height="23" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_pad="5" + name="cancel btn" + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml index 88dae0d20b..acff55386b 100644 --- a/indra/newview/skins/default/xui/en/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml @@ -1,21 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_minimize="false" - height="140" + height="220" layout="topleft" name="Give Money" help_topic="give_money" save_rect="true" - width="300"> - <text + width="225"> + <text type="string" length="1" follows="left|top" - font="SansSerif" - halign="right" + font="SansSerifBold" height="18" layout="topleft" - left="5" + left="12" name="payee_group" top="7" width="75"> @@ -25,26 +24,34 @@ type="string" length="1" follows="left|top" - font="SansSerif" - halign="right" + font="SansSerifBold" height="18" layout="topleft" - left_delta="0" + left="12" name="payee_resident" - top_delta="0" + top="7" width="75"> Pay resident: </text> + <icon + height="16" + width="16" + image_name="Generic_Person" + mouse_opaque="true" + name="icon_person" + tool_tip="Person" + top_pad="0" + left="10" + /> <text type="string" length="1" follows="left|top" font="SansSerif" - height="18" + height="16" layout="topleft" - left_pad="5" + left_pad="7" name="payee_name" - top_delta="0" width="210"> [FIRST] [LAST] </text> @@ -52,16 +59,25 @@ type="string" length="1" follows="left|top" - font="SansSerif" - halign="right" - height="18" + halign="left" + height="16" layout="topleft" - left="5" + left="30" name="object_name_label" - top="32" - width="75"> + top_pad="0" + width="150"> Via object: </text> + <icon + height="16" + width="16" + image_name="Inv_Object" + mouse_opaque="true" + name="icon_object" + tool_tip="Objects" + top_pad="0" + left="30" + /> <text type="string" length="1" @@ -75,101 +91,78 @@ width="210"> ... </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - halign="right" - height="18" - layout="topleft" - left="5" - name="fastpay text" - top="54" - width="75"> - Fast Pay: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - halign="right" - height="18" - layout="topleft" - left_delta="0" - name="amount text" - top_pad="40" - width="75"> - Amount: - </text> - <button - height="20" + <button + height="23" label="L$1" label_selected="L$1" layout="topleft" - left="85" + left="25" name="fastpay 1" - top="54" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$5" label_selected="L$5" layout="topleft" - left_pad="5" + left_pad="15" name="fastpay 5" - top_delta="0" width="80" /> <button - height="20" + height="23" label="L$10" label_selected="L$10" layout="topleft" - left="85" + left="25" name="fastpay 10" - top="78" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$20" label_selected="L$20" layout="topleft" - left_pad="5" + left_pad="15" name="fastpay 20" - top_delta="0" + width="80" /> + <text + type="string" + length="1" + follows="left|top" + height="18" + layout="topleft" + left="25" + name="amount text" + top_pad="8" + width="180"> + Or, choose amount: + </text> + <line_editor + border_style="line" + follows="left|top|right" + height="19" + top_pad="0" + layout="topleft" + left="120" + max_length="9" + name="amount" width="80" /> <button enabled="false" - follows="right|bottom" - height="20" + height="23" label="Pay" label_selected="Pay" layout="topleft" - left="140" + left="10" name="pay btn" - top="112" - width="70" /> + top_pad="5" + width="100" /> <button - follows="right|bottom" - height="20" + height="23" label="Cancel" label_selected="Cancel" layout="topleft" left_pad="5" name="cancel btn" - top_delta="0" - width="70" /> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerif" - height="18" - layout="topleft" - left_delta="-130" - max_length="9" - name="amount" - top_delta="0" - width="50" /> + width="100" /> </floater> |