diff options
7 files changed, 240 insertions, 282 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 453e1319a6..ae8391d01e 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -161,7 +161,7 @@ </scroll_container> <panel follows="left|right|bottom" - height="30" + height="25" label="bottom_panel" layout="topleft" left="10" @@ -169,7 +169,7 @@ top_pad="2"> <button follows="bottom|left" - height="25" + height="19" label="Save [WHAT]" layout="topleft" name="save_changes_btn" @@ -178,7 +178,7 @@ width="130" /> <button follows="bottom|left" - height="25" + height="19" label="Cancel" layout="topleft" name="cancel_btn" diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 0202323dcf..7aa2fa2632 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -1,20 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - class="edit_profile_panel" - background_visible="true" - bevel_style="in" - follows="left|top|right|bottom" - height="420" + class="edit_profile_panel" + follows="all" + height="535" label="Profile Edit" layout="topleft" - left="10" - mouse_opaque="true" + left="0" name="edit_profile_panel" - top="10" - width="255"> + top="0" + width="313"> <string name="CaptionTextAcctInfo"> - [ACCTTYPE] + [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] </string> <string @@ -51,83 +48,82 @@ <string name="no_partner_text" value="None" /> - <scroll_container + <scroll_container color="DkGray2" - follows="left|top|right|bottom" - height="300" + follows="all" + height="505" + min_height="300" layout="topleft" left="0" name="profile_scroll" reserve_scroll_corner="true" opaque="true" - width="255"> + top="0"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + height="505" + min_height="300" + left="0" + width="313"> <panel - name="scroll_content_panel" + name="data_panel" follows="left|top|right" - layout="topleft" - top="0" - left="0" - width="240" - height="760"> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - follows="left|top|right|bottom" - height="750" - layout="topleft" - left="0" - name="data_panel" - top_pad="10" - width="260"> + layout="topleft" + top="0" + height="505" + min_height="300" + left="0" + width="313"> <panel - follows="left|top" - height="120" - layout="topleft" - left="10" name="lifes_images_panel" - top_pad="10" - width="265"> - <panel - height="137" - layout="topleft" - left="0" - name="second_life_image_panel" - top="0" - width="125"> - <text - type="string" - length="1" - follows="left|top|right|bottom" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="0" + follows="left|top|right" + height="244" + layout="topleft" + top="0" + left="0" + width="285"> + <panel + follows="left|top" + height="117" + layout="topleft" + left="10" + name="second_life_image_panel" + top="0" + width="285"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="117" + layout="topleft" + left="0" + name="2nd_life_pic" + top="10" + width="102" /> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left_pad="10" name="second_life_photo_title_text" - text_color="white" - top="0" - width="240"> - [SECOND_LIFE]: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - follows="top|left" - height="117" - layout="topleft" - left="0" - name="2nd_life_pic" - top_pad="5" - width="102" /> + text_color="white" + top_delta="0" + value="[SECOND_LIFE]:" + width="170" /> </panel> <icon height="16" - image_name="image_edit_icon.tga" + image_name="AddItem_Off" layout="topleft" - left="75" + left="90" name="2nd_life_edit_icon" - tool_tip="Click to select an image" - top="35" + tool_tip="Click to select an image" + top="10" width="16" /> </panel> <text_editor @@ -135,108 +131,67 @@ length="1" follows="left|top|right" font="SansSerifSmall" - height="125" + height="90" layout="topleft" left="120" - top="30" - max_length="511" + top="28" name="sl_description_edit" - width="115" + width="173" word_wrap="true"> </text_editor> <panel - height="137" - layout="topleft" - left="10" - name="first_life_image_panel" - top_pad="20" - width="125"> - <text - type="string" - length="1" - follows="left|top|right|bottom" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="0" - name="real_world_photo_title_text" - text_color="white" - top="0" - width="125"> - Real World: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - follows="top|left" - height="117" - layout="topleft" - left="0" - name="real_world_pic" - top_pad="5" - width="102" /> + follows="left|top" + height="117" + layout="topleft" + top_pad="10" + left="10" + name="first_life_image_panel" + width="285"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="117" + layout="topleft" + left="0" + name="real_world_pic" + width="102" /> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left_pad="10" + name="real_world_photo_title_text" + text_color="white" + top_delta="0" + value="Real World:" + width="173" /> </panel> - <icon + <icon height="16" - image_name="image_edit_icon.tga" + image_name="AddItem_Off" layout="topleft" - left="85" + left="90" name="real_world_edit_icon" - tool_tip="Click to select an image" - top="210" + tool_tip="Click to select an image" + top="130" width="16" /> <text_editor type="string" length="1" follows="left|top|right" font="SansSerifSmall" - height="125" + height="90" layout="topleft" left="120" - top="195" - max_length="254" + top="150" name="fl_description_edit" - width="115" + width="173" word_wrap="true"> </text_editor> <text - type="string" - follows="left|top" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="10" - name="online_me_status_text" - text_color="white" - top_pad="20" - width="255"> - Status: - </text> - <combo_box - font="SansSerifSmall" - follows="left|top" - height="18" - layout="topleft" - left="10" - top_pad="5" - name="status_combo" - width="140"> - <combo_box.item - label="Online" - name="online" - value="online" /> - <combo_box.item - label="Away" - name="away" - value="away" /> - <combo_box.item - label="Busy" - name="busy" - value="busy" /> - </combo_box> - <text type="string" length="1" follows="left|top" @@ -247,8 +202,8 @@ left="10" name="title_homepage_text" text_color="white" - top_pad="20" - width="240"> + top_pad="5" + width="285"> Homepage: </text> <line_editor @@ -256,45 +211,45 @@ font="SansSerifSmall" height="20" layout="topleft" - left="9" + left="10" + top_pad="0" + value="http://" name="homepage_edit" - width="220"> - TODO + width="285"> </line_editor> <check_box follows="left|top" font="SansSerifSmall" - label="Show me in Search results" + label="Show me in Search results" layout="topleft" left="10" name="show_in_search_checkbox" - height="16" + height="15" text_enabled_color="white" - top_pad="20" - width="240"/> + top_pad="10" + width="240" /> <text follows="left|top" font="SansSerifSmall" - font.style="BOLD" + font.style="BOLD" height="15" layout="topleft" left="10" name="title_acc_status_text" text_color="white" - top_pad="15" - value="Account Status:" - width="100" /> + top_pad="5" + value="My Account:" + width="285" /> <text type="string" follows="left|top" font="SansSerifSmall" height="15" layout="topleft" - left_pad="10" + left="10" name="my_account_link" - top_delta="0" - value="Go to Dashboard" - width="100"/> + value="Go to My Dashboard" + width="285" /> <text follows="left|top|right" height="20" @@ -303,7 +258,7 @@ name="acc_status_text" top_pad="5" value="Resident. No payment info on file." - width="255" + width="285" word_wrap="true" /> <text follows="left|top" @@ -314,26 +269,26 @@ left="10" name="title_partner_text" text_color="white" - top_pad="15" - value="Partner:" - width="100" /> + top_pad="5" + value="My Partner:" + width="150" /> <text follows="left|top" height="15" + halign="right" layout="topleft" left_pad="10" + right="-10" name="partner_edit_link" - top_delta="0" value="[[URL] Edit]" - width="100" /> + width="150" /> <panel follows="left|top|right" height="15" layout="topleft" left="10" name="partner_data_panel" - top_pad="10" - width="255"> + width="285"> <text follows="left|top|right" height="30" @@ -342,7 +297,7 @@ name="partner_text" top="0" value="[FIRST] [LAST]" - width="240" + width="285" word_wrap="true" /> </panel> <text @@ -356,36 +311,36 @@ left="10" name="title_afk_text" text_color="white" - top_pad="15" - width="240"> + top_pad="5" + width="190"> Away Timeout: </text> <spinner control_name="AFKTimeout" decimal_digits="0" follows="left|top" - height="16" + halign="right" + height="15" increment="1" initial_value="300" label="" label_width="0" layout="topleft" - left="10" max_val="600" min_val="30" name="afk_timeout_spinner" - top_pad="5" + left_pad="4" width="50" /> <text type="string" length="1" follows="left|top" - height="10" + halign="left" + height="15" layout="topleft" - left_pad="10" + left_pad="2" name="seconds_textbox" - top_delta="0" - width="128"> + width="70"> seconds </text> <text @@ -394,12 +349,12 @@ follows="left|top" height="10" layout="topleft" - font="SansSerifSmall" + font="SansSerifSmall" font.style="BOLD" - left="12" + text_color="white" + left="10" mouse_opaque="false" name="text_box3" - top_pad="25" width="240"> Busy Mode Response: </text> @@ -407,29 +362,27 @@ control_name="BusyModeResponse2" commit_on_focus_lost = "true" follows="left|top" - height="70" + height="56" layout="topleft" - left="12" + left="10" name="busy_response" - top_pad="10" - width="240" + width="285" word_wrap="true"> log_in_to_change - </text_editor> + </text_editor> </panel> </panel> </scroll_container> - <panel + <panel follows="bottom|left" - height="30" + height="20" left="10" name="profile_me_buttons_panel" - top_pad="10" - width="240"> + top_pad="5" + width="303"> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" + height="19" label="Save Changes" layout="topleft" left="0" @@ -438,16 +391,12 @@ width="130" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" + height="19" label="Cancel" layout="topleft" - left_pad="5" + left_pad="10" name="cancel_btn" - top_delta="0" + right="-1" width="130" /> </panel> </panel> - - - diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 7d5ae3d78a..1f12a9782e 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -1,38 +1,42 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - bevel_style="in" - follows="left|top|right|bottom" + background_visible="true" + follows="all" height="570" layout="topleft" left="0" + min_height="350" name="panel_pick_info" top="0" width="333"> <button - follows="top|left" - height="25" - width="25" + follows="top|right" + height="23" image_overlay="BackArrow_Off" layout="topleft" name="back_btn" picture_style="true" left="10" - top="7" /> + tab_stop="false" + top="2" + width="23" /> <text - follows="top|left" + follows="top|left|right" font="SansSerifHugeBold" - height="22" + height="26" layout="topleft" - left_pad="15" + left_pad="10" name="title" text_color="white" + top="0" value="Pick Info" - width="270" /> + use_elipsis="true" + width="275" /> <scroll_container color="DkGray2" opaque="true" follows="all" - height="470" + height="500" layout="topleft" left="10" top_pad="10" @@ -57,11 +61,11 @@ left="10" name="pick_snapshot" top="20" - width="280" /> + width="290" /> <text follows="left|top|right" - height="20" - width="280" + height="35" + width="290" layout="topleft" font="SansSerifBig" font.style="BOLD" @@ -77,7 +81,7 @@ layout="topleft" left="10" name="pick_location" - width="280" + width="290" word_wrap="true" value="[loading...]" /> <text @@ -86,47 +90,47 @@ layout="topleft" left="10" name="pick_desc" - width="280" + width="290" value="[description]" word_wrap="true" /> </panel> </scroll_container> <panel follows="left|right|bottom" - height="30" + height="20" layout="topleft" - top_pad="5" + top_pad="8" left="10" name="buttons"> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Edit" + font="SansSerifSmall" + height="19" + label="Teleport" layout="topleft" left="0" - name="edit_btn" + name="teleport_btn" top="0" - width="80" /> + width="90" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" + font="SansSerifSmall" + height="19" + label="Map" layout="topleft" - left_pad="5" - name="teleport_btn" + left_pad="10" + name="show_on_map_btn" top="0" - width="80" /> + width="90" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Map" + font="SansSerifSmall" + height="19" + label="Edit" layout="topleft" - left_pad="5" - name="show_on_map_btn" + right="-1" + name="edit_btn" top="0" - width="80" /> + width="90" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 686faab8eb..1074dd4627 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -2,79 +2,82 @@ <panel bevel_style="none" follows="top|left|right" - height="120" + height="85" layout="topleft" left="0" name="picture_item" top="0" - width="305"> + width="313"> <icon - follows="top|bottom|left|right" - height="120" + follows="all" + height="85" image_name="ListItem_Over" - left="0" + right="-3" mouse_opaque="false" name="hovered_icon" - top="0" + top="1" scale_image="true" visible="false" - width="305"/> + width="307"/> <icon - follows="top|bottom|left|right" - height="120" + follows="all" + height="85" image_name="ListItem_Select" - left="0" + right="-3" mouse_opaque="false" name="selected_icon" - top="0" + top="1" scale_image="true" visible="false" - width="305"/> + width="307"/> <texture_picker allow_no_texture="true" - default_image_name="None" + border_enabled="true" + default_image_name="TabIcon_Places_Large" enabled="false" follows="left|top" - height="120" + height="80" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="picture" tab_stop="false" - top="5" - top_pad="5" - width="120" /> + top="10" + top_pad="10" + width="90" /> <text follows="top|left|right" + font="SansSerifSmallBold" height="16" layout="topleft" - left="135" + left="110" name="picture_name" text_color="white" - top="5" - use_ellipses="true" - width="130" - word_wrap="true" /> + top="9" + use_ellipses="false" + width="197" + word_wrap="false" /> <text follows="top|left|right" - height="75" + font="SansSerifSmall" + height="40" layout="topleft" - left="135" + left="110" name="picture_descr" - top_pad="10" - use_ellipses="true" - width="130" + top_pad="3" + width="178" word_wrap="true" /> <button follows="top|right" height="16" - image_selected="Info_Press" - image_unselected="Info_Off" + image_selected="BuyArrow_Press" + image_pressed="BuyArrow_Press" + image_unselected="BuyArrow_Press" layout="topleft" name="info_chevron" picture_style="true" - right="290" + right="-7" tab_stop="false" - top="5" + top="27" width="16" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index ba933683e3..9f22f8a5ed 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -319,12 +319,13 @@ follows="bottom|left" layout="topleft" left="0" + top_pad="-17" name="profile_me_buttons_panel" - top_pad="-3" visible="false" height="19"> <button follows="bottom|right" + font="SansSerifSmall" height="19" left="10" label="Edit Profile" diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml index 4d91a544c3..203aed2adb 100644 --- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml @@ -4,12 +4,12 @@ height="25" layout="topleft" name="panel_stand_stop_flying" - mouse_opaque="false" - visible="false" + mouse_opaque="false" + visible="false" width="115"> <button follows="left|bottom" - height="20" + height="19" label="Stand" layout="topleft" name="stand_btn" @@ -19,7 +19,7 @@ width="115" /> <button follows="left|bottom" - height="20" + height="19" label="Stop Flying" layout="topleft" name="stop_fly_btn" diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 3e7e07749a..5bb48ef5aa 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -11,6 +11,7 @@ image_color="ButtonImageColor" image_color_disabled="ButtonImageColor" flash_color="ButtonFlashBgColor" + font="SansSerifSmall" hover_glow_amount="0.15" halign="center" scale_image="true"> |