diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-09-09 21:53:14 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-09-09 21:53:14 +0300 |
| commit | b4704f5f8bf4b72edcf00aa74759ae73c89c5422 (patch) | |
| tree | 691596f632ef36d7ec1c0705ada0a9f4070f8139 /indra/newview/skins/default/xui/en | |
| parent | 1285807ec2f58c7dcab2f747461195e126ef26e3 (diff) | |
| parent | b1c5edc5135b4ade68b0aa839506ea013dc2f40d (diff) | |
Merge viewer-bear and become version 3.7.16
Diffstat (limited to 'indra/newview/skins/default/xui/en')
26 files changed, 1207 insertions, 1269 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml index 4535b9084e..2ea34fb751 100644 --- a/indra/newview/skins/default/xui/en/floater_facebook.xml +++ b/indra/newview/skins/default/xui/en/floater_facebook.xml @@ -2,7 +2,6 @@ <floater positioning="cascading" can_close="true" - can_resize="true" help_topic="floater_facebook" layout="topleft" name="floater_facebook" @@ -10,23 +9,15 @@ single_instance="true" reuse_instance="true" title="POST TO FACEBOOK" - min_height="501" + min_height="462" min_width="304" - height="482" - width="304"> - <panel - height="482" - width="304" - visible="true" - name="background" - follows="all" - top="0" - left="0"> + height="462" + width="272"> <tab_container name="tabs" tab_group="1" - tab_min_width="70" - tab_height="30" + tab_min_width="64" + tab_height="21" tab_position="top" top="7" height="437" @@ -57,23 +48,19 @@ follows="all" label="FRIENDS" name="panel_facebook_friends"/> - <panel + <!--<panel filename="panel_facebook_account.xml" class="llfacebookaccountpanel" follows="all" label="ACCOUNT" - name="panel_facebook_account"/> + name="panel_facebook_account"/>--> </tab_container> - <panel - name="connection_status_panel" - follows="left|bottom|right" - height="24"> <text name="connection_error_text" type="string" follows="left|bottom|right" - top="5" - left="9" + bottom="-5" + left="10" width="250" height="20" wrap="true" @@ -88,14 +75,14 @@ height="24" width="24" name="connection_loading_indicator" - top="2" - left="9" + top_delta="-2" + left="10" visible="true"/> <text name="connection_loading_text" type="string" follows="left|bottom|right" - top="5" + top_delta="2" left_pad="5" width="250" height="20" @@ -106,6 +93,4 @@ font="SansSerif"> Loading... </text> - </panel> - </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml index 1a9ffd0489..24de3ddd8d 100644 --- a/indra/newview/skins/default/xui/en/floater_flickr.xml +++ b/indra/newview/skins/default/xui/en/floater_flickr.xml @@ -10,11 +10,11 @@ single_instance="true" reuse_instance="true" title="UPLOAD TO FLICKR" - height="622" - width="304"> + height="590" + width="272"> <panel - height="622" - width="304" + height="590" + width="272" visible="true" name="background" follows="all" @@ -24,10 +24,11 @@ name="tabs" tab_group="1" tab_min_width="70" - tab_height="30" + tab_height="21" tab_position="top" top="7" - height="577" + height="555" + follows="all" halign="center" use_highlighting_on_hover="true"> <panel @@ -51,8 +52,8 @@ name="connection_error_text" type="string" follows="left|bottom|right" - top="5" - left="9" + bottom="-5" + left="10" width="250" height="20" wrap="true" @@ -67,14 +68,14 @@ height="24" width="24" name="connection_loading_indicator" - top="2" - left="9" + top_delta="-2" + left="10" visible="true"/> <text name="connection_loading_text" type="string" follows="left|bottom|right" - top="5" + top_delta="2" left_pad="5" width="250" height="20" diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index c86ed595a7..17bc818cc1 100755 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_minimize="false" - height="408" + height="440" layout="topleft" name="Inventory Finder" help_topic="inventory_finder" @@ -95,36 +95,36 @@ width="126" /> <icon height="16" - image_name="Inv_Mesh" + image_name="Inv_Notecard" layout="topleft" left="8" mouse_opaque="true" - name="icon_mesh" - top="142" + name="icon_notecard" + top="122" width="16" /> <check_box height="16" - label="Meshes" + label="Notecards" layout="topleft" left_pad="2" - name="check_mesh" + name="check_notecard" top_delta="0" width="126" /> <icon height="16" - image_name="Inv_Notecard" + image_name="Inv_Mesh" layout="topleft" left="8" mouse_opaque="true" - name="icon_notecard" - top="122" + name="icon_mesh" + top="142" width="16" /> <check_box height="16" - label="Notecards" + label="Meshes" layout="topleft" left_pad="2" - name="check_notecard" + name="check_mesh" top_delta="0" width="126" /> <icon @@ -223,25 +223,33 @@ top="262" width="100" /> <button - follows="left|top" height="20" label="None" label_selected="None" - layout="topleft" left_delta="0" name="None" - top_pad="4" + left_pad="10" width="100" /> <check_box height="16" label="Always show folders" layout="topleft" - left_delta="0" + left="8" name="check_show_empty" - top_pad="4" + top_pad="6" width="144" /> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="10" + name="horiz_separator" + top_pad="8" + width="260"/> <check_box height="16" + top="324" label="Since Logoff" layout="topleft" left_delta="0" @@ -257,36 +265,74 @@ layout="topleft" left_delta="0" name="- OR -" - top_delta="16" + top="342" width="144"> - OR - </text> + <radio_group + height="16" + layout="topleft" + name="date_search_direction" + top="360" + left="8" + width="270"> + <radio_item + label="Newer than" + layout="topleft" + name="newer" + top_pad="6" + left="0" /> + <radio_item + label="Older than" + layout="topleft" + name="older" + top_delta="0" + left="120" /> + </radio_group> <spinner follows="left|top" height="16" increment="1" initial_value="0" - label="Hours Ago" - label_width="64" layout="topleft" left_delta="0" max_val="240000" name="spin_hours_ago" top_pad="4" - width="144" /> + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left_pad="3" + top_delta="4" + width="80"> + Hours + </text> <spinner follows="left|top" height="16" increment="1" initial_value="0" - label="Days Ago" - label_width="64" layout="topleft" - left_delta="0" max_val="10000" name="spin_days_ago" top_pad="4" - width="144" /> + left="8" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left_pad="3" + top_delta="4" + width="80"> + Days + </text> <button follows="top|right" height="20" @@ -295,6 +341,6 @@ layout="topleft" name="Close" right="-6" - top="382" + top="406" width="76" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index f5d5d7e075..76adaad57c 100755 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -3,8 +3,9 @@ positioning="cascading" legacy_header_height="18" can_minimize="true" + can_resize="false" can_close="true" - height="500" + height="455" layout="topleft" name="Snapshot" single_instance="true" @@ -12,7 +13,8 @@ save_rect="true" save_visibility="false" title="SNAPSHOT" - width="470"> + width="624" + min_height="455"> <floater.string name="unknown"> unknown @@ -58,11 +60,11 @@ Saved to Computer! </string> <string - name="facebook_failed_str"> + name="facebook_failed_str"> Failed to upload image to your Facebook timeline. </string> <string - name="profile_failed_str"> + name="profile_failed_str"> Failed to upload image to your Profile Feed. </string> <string @@ -79,35 +81,231 @@ </string> <button follows="left|top" - height="23" - image_overlay="TabIcon_Close_Off" + height="25" + image_overlay="Refresh_Off" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + image_overlay_alignment="left" + imgoverlay_label_space="5" + pad_bottom="0" + halign="left" layout="topleft" - left="236" - name="advanced_options_btn" - tool_tip="Advanced options" - top="25" - width="23" /> - <ui_ctrl - height="160" - width="250" - layout="topleft" - name="thumbnail_placeholder" - top="50" - follows="left|top" - left="10"> + left="10" + label="REFRESH" + name="new_snapshot_btn" + top_pad="26" + width="167" /> + <button + follows="left|top" + control_name="AdvanceSnapshot" + invisibility_control="AdvanceSnapshot" + height="25" + is_toggle="true" + layout="topleft" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Off" + image_unselected="Toolbar_Middle_Off" + image_overlay="Conv_toolbar_expand" + name="retract_btn" + left_pad="1" + top_delta="0" + width="31" /> + <button + follows="left|top" + control_name="AdvanceSnapshot" + visibility_control="AdvanceSnapshot" + height="25" + is_toggle="true" + layout="topleft" + image_overlay="Conv_toolbar_collapse" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Off" + image_unselected="Toolbar_Middle_Off" + name="extend_btn" + left_delta="0" + top_delta="0" + width="31" /> + <panel + height="154" + layout="topleft" + follows="top|left" + left="0" + name="advanced_options_panel" + top_pad="-6" + width="210"> + <view_border + bevel_style="in" + follows="left|top|right" + height="1" + left="10" + layout="topleft" + name="advanced_options_hr" + right="-1" + top_pad="5" + /> + <text + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left="10" + name="layer_type_label" + top_pad="10" + width="100"> + Capture: + </text> + <combo_box + follows="left|top|right" + height="23" + label="Image Layers" + layout="topleft" + left="30" + name="layer_types" + right="-2"> + <combo_box.item + label="Colors" + name="Colors" + value="colors" /> + <combo_box.item + label="Depth" + name="Depth" + value="depth" /> + </combo_box> + <check_box + label="Interface" + layout="topleft" + left="30" + height="16" + top_pad="8" + width="180" + name="ui_check" /> + <check_box + label="HUDs" + layout="topleft" + height="16" + left="30" + top_pad="1" + width="180" + name="hud_check" /> + <check_box + label="Freeze frame (fullscreen)" + layout="topleft" + height="16" + left="10" + top_pad="1" + width="180" + name="freeze_frame_check" /> + <check_box + label="Auto-refresh" + layout="topleft" + height="16" + left="10" + top_pad="1" + width="180" + name="auto_snapshot_check" /> + <text + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left="10" + name="filter_list_label" + top_pad="10" + width="50"> + Filter: + </text> + <combo_box + control_name="PhotoFilters" + follows="left|right|top" + name="filters_combobox" + tool_tip="Image filters" + top_delta="-3" + left="50" + right="-1" + height="21" + width="135"> + <combo_box.item + label="No Filter" + name="NoFilter" + value="NoFilter" /> + </combo_box> + <view_border + bevel_style="in" + follows="left|top|right" + height="1" + left="10" + layout="topleft" + name="advanced_options_hr" + right="-1" + top_pad="7" + /> + </panel> + <panel_container + follows="left|top" + height="230" + layout="topleft" + left="0" + name="panel_container" + default_panel_name="panel_snapshot_options" + top_pad="10" + width="215"> + <panel + class="llpanelsnapshotoptions" + filename="panel_snapshot_options.xml" + follows="all" + layout="topleft" + left="0" + name="panel_snapshot_options" + top="0" /> <panel - background_visible="true" - bg_alpha_color="0.9 1 0.9 1" + class="llpanelsnapshotprofile" + follows="all" + layout="topleft" + name="panel_snapshot_profile" + filename="panel_snapshot_profile.xml" /> + <panel + class="llpanelsnapshotpostcard" + follows="all" + layout="topleft" + name="panel_snapshot_postcard" + filename="panel_snapshot_postcard.xml" /> + <panel + class="llpanelsnapshotinventory" + follows="all" + layout="topleft" + name="panel_snapshot_inventory" + filename="panel_snapshot_inventory.xml" /> + <panel + class="llpanelsnapshotlocal" + follows="all" + layout="topleft" + name="panel_snapshot_local" + filename="panel_snapshot_local.xml" /> + </panel_container> + <view_border + bevel_style="in" + follows="left|top" + height="1" + left="10" + layout="topleft" + name="status_hr" + width="199" + top_pad="-16"/> + <panel + background_visible="false" follows="left|top" font="SansSerifLarge" halign="center" height="20" layout="topleft" - left="0" + left="10" length="1" name="succeeded_panel" - right="-1" - top="0" + width="198" + top_pad="1" type="string" visible="false"> <text @@ -120,7 +318,7 @@ length="1" name="succeeded_lbl" right="-1" - text_color="0.2 0.5 0.2 1" + text_color="0.2 0.85 0.2 1" top="4" translate="false" type="string"> @@ -128,18 +326,17 @@ </text> </panel> <panel - background_visible="true" - bg_alpha_color="1 0.9 0.9 1" + background_visible="false" follows="left|top" font="SansSerifLarge" halign="center" height="20" layout="topleft" - left_delta="0" + left="10" length="1" name="failed_panel" - right="-1" - top="0" + width="198" + top_delta="0" type="string" visible="false"> <text @@ -152,7 +349,7 @@ length="1" name="failed_lbl" right="-1" - text_color="0.5 0.2 0.2 1" + text_color="0.95 0.4 0.4 1" top="4" translate="false" type="string"> @@ -161,51 +358,39 @@ </panel> <loading_indicator follows="left|top" - height="48" + height="24" layout="topleft" name="working_indicator" - left="101" - top="46" + left="10" + top_delta="0" visible="false" - width="48" /> + width="24" /> <text - follows="left|top|right" + follows="left|top" font="SansSerifBold" height="14" layout="topleft" - left="5" + left_pad="3" length="1" - halign="center" + halign="left" name="working_lbl" - right="-5" - top="98" + top_delta="5" translate="false" type="string" visible="false" - width="130"> + width="162"> Working </text> - <button - follows="left|top" - height="22" - image_overlay="Refresh_Off" - layout="topleft" - left="20" - name="new_snapshot_btn" - bottom="-20" - visible="false" - width="22" /> <text follows="left|top" font="SansSerifBold" halign="left" height="18" layout="topleft" - left_pad="10" + left="10" length="1" name="refresh_lbl" - right="-5" - text_color="red" + text_color="0.95 0.4 0.4 1" top_delta="0" translate="false" type="string" @@ -213,37 +398,44 @@ width="130"> Refresh to save. </text> - </ui_ctrl> + <ui_ctrl + layout="topleft" + name="thumbnail_placeholder" + top="23" + left="215" + width="400" + height="400" + follows="top|left"/> <view_border bevel_style="in" height="21" - width="250" layout="topleft" name="img_info_border" - top_pad="3" - follows="left|top" - left_delta="0" - /> + top_pad="0" + right="-10" + follows="left|top|right" + left_delta="0"/> <text type="string" font="SansSerifSmall" length="1" - follows="left|top" + follows="left|top|right" height="14" layout="topleft" - left_delta="5" + left="220" + right="-20" halign="left" name="image_res_text" top_delta="5" - width="100"> - [WIDTH] x [HEIGHT] px + width="200"> + [WIDTH]px (width) x [HEIGHT]px (height) </text> <text - follows="left|top" + follows="right|top" font="SansSerifSmall" height="14" layout="topleft" - left="200" + left="-65" length="1" halign="right" name="file_size_label" @@ -252,161 +444,4 @@ width="50"> [SIZE] KB </text> - <panel_container - follows="left|top" - height="260" - layout="topleft" - left="0" - name="panel_container" - default_panel_name="panel_snapshot_options" - top_pad="10" - width="270"> - <panel - class="llpanelsnapshotoptions" - filename="panel_snapshot_options.xml" - follows="all" - layout="topleft" - left="0" - name="panel_snapshot_options" - top="0" /> - <panel - class="llpanelsnapshotprofile" - follows="all" - layout="topleft" - name="panel_snapshot_profile" - filename="panel_snapshot_profile.xml" /> - <panel - class="llpanelsnapshotpostcard" - follows="all" - layout="topleft" - name="panel_snapshot_postcard" - filename="panel_snapshot_postcard.xml" /> - <panel - class="llpanelsnapshotinventory" - follows="all" - layout="topleft" - name="panel_snapshot_inventory" - filename="panel_snapshot_inventory.xml" /> - <panel - class="llpanelsnapshotlocal" - follows="all" - layout="topleft" - name="panel_snapshot_local" - filename="panel_snapshot_local.xml" /> - </panel_container> - <panel - height="295" - layout="topleft" - left="270" - name="advanced_options_panel" - top="20" - width="200"> - <text - type="string" - font="SansSerifSmall" - length="1" - follows="left|top" - height="14" - layout="topleft" - left="10" - halign="left" - name="advanced_options_label" - right="-10" - top="10"> - ADVANCED OPTIONS - </text> - <view_border - bevel_style="in" - follows="left|top|right" - height="1" - left="10" - layout="topleft" - name="advanced_options_hr" - right="-10" - top_pad="5" - /> - <text - type="string" - length="1" - follows="left|top" - height="13" - layout="topleft" - left="10" - name="layer_type_label" - top_pad="10" - width="50"> - Capture: - </text> - <combo_box - follows="left|top|right" - height="23" - label="Image Layers" - layout="topleft" - left="30" - name="layer_types" - right="-10"> - <combo_box.item - label="Colors" - name="Colors" - value="colors" /> - <combo_box.item - label="Depth" - name="Depth" - value="depth" /> - </combo_box> - <check_box - label="Interface" - layout="topleft" - left="30" - top_pad="10" - width="180" - name="ui_check" /> - <check_box - label="HUDs" - layout="topleft" - left="30" - top_pad="10" - width="180" - name="hud_check" /> - <check_box - label="Freeze frame (fullscreen)" - layout="topleft" - left="10" - top_pad="8" - width="180" - name="freeze_frame_check" /> - <check_box - label="Auto-refresh" - layout="topleft" - left="10" - top_pad="8" - width="180" - name="auto_snapshot_check" /> - <text - type="string" - length="1" - follows="left|top" - height="13" - layout="topleft" - left="10" - name="filter_list_label" - top_pad="10" - width="50"> - Filter: - </text> - <combo_box - control_name="PhotoFilters" - follows="left|right|top" - name="filters_combobox" - tool_tip="Image filters" - top_pad="8" - left="30" - height="21" - width="135"> - <combo_box.item - label="No Filter" - name="NoFilter" - value="NoFilter" /> - </combo_box> - </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 0b71177345..36ceddd305 100755 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -38,6 +38,18 @@ name="none_descriptor"> None found. </floater.string> + <floater.string + name="URLs"> + URLs + </floater.string> + <floater.string + name="memory"> + Memory (KB) + </floater.string> + + + + <text type="string" length="1" @@ -82,7 +94,7 @@ name="parcel" width="120" /> <scroll_list.columns - label="Time" + label="Date" name="time" width="130" /> <scroll_list.columns diff --git a/indra/newview/skins/default/xui/en/floater_twitter.xml b/indra/newview/skins/default/xui/en/floater_twitter.xml index aa5bfce2e9..3e1a91e58d 100644 --- a/indra/newview/skins/default/xui/en/floater_twitter.xml +++ b/indra/newview/skins/default/xui/en/floater_twitter.xml @@ -10,21 +10,13 @@ single_instance="true" reuse_instance="true" title="TWITTER" - height="502" - width="304"> - <panel - height="502" - width="304" - visible="true" - name="background" - follows="all" - top="0" - left="0"> + height="462" + width="272"> <tab_container name="tabs" tab_group="1" tab_min_width="70" - tab_height="30" + tab_height="21" tab_position="top" top="7" height="457" @@ -43,17 +35,13 @@ label="ACCOUNT" name="panel_twitter_account"/> </tab_container> - <panel - name="connection_status_panel" - follows="left|bottom|right" - height="24"> <text name="connection_error_text" type="string" follows="left|bottom|right" - top="5" - left="9" - width="250" + bottom="-5" + left="10" + width="252" height="20" wrap="true" halign="left" @@ -67,16 +55,16 @@ height="24" width="24" name="connection_loading_indicator" - top="2" - left="9" + top_delta="-2" + left="10" visible="true"/> <text name="connection_loading_text" type="string" follows="left|bottom|right" - top="5" + top_delta="2" left_pad="5" - width="250" + width="223" height="20" wrap="true" halign="left" @@ -85,6 +73,4 @@ font="SansSerif"> Loading... </text> - </panel> - </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index d2519a5aa4..06d0b849a3 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -63,7 +63,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Show Filters" + label="Show Filters..." layout="topleft" name="show_filters"> <on_click diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 944f600ef7..570ecf241e 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -169,6 +169,16 @@ No tutorial is currently available. <notification icon="alertmodal.tga" + name="GenericAlertOK" + type="alertmodal"> +[MESSAGE] + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="BadInstallation" type="alertmodal"> An error occurred while updating [APP_NAME]. Please [http://get.secondlife.com download the latest version] of the Viewer. @@ -4661,6 +4671,17 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu <notification icon="alertmodal.tga" + name="RegionTPSpecialUsageBlocked" + type="alertmodal"> + <tag>fail</tag> + Unable to enter region. '[REGION_NAME]' is a Skill Gaming Region, and you must meet certain criteria in order to enter. For details, please review the [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ]. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="PreferredMaturityChanged" type="alertmodal"> You won't receive any more notifications that you're about to visit a region with [RATING] content. You may change your content preferences in the future by using Me > Preferences > General from the menu bar. diff --git a/indra/newview/skins/default/xui/en/panel_facebook_account.xml b/indra/newview/skins/default/xui/en/panel_facebook_account.xml deleted file mode 100644 index 122cbfb717..0000000000 --- a/indra/newview/skins/default/xui/en/panel_facebook_account.xml +++ /dev/null @@ -1,77 +0,0 @@ -<panel - height="400" - width="304" - layout="topleft" - follows="all" - name="panel_facebook_account"> - <string - name="facebook_connected" - value="You are connected to Facebook as:" /> - <string - name="facebook_disconnected" - value="Not connected to Facebook" /> - <text - layout="topleft" - length="1" - follows="top|left" - font="SansSerif" - height="16" - left="9" - name="account_caption_label" - top="21" - type="string"> - Not connected to Facebook. - </text> - <text - layout="topleft" - top_pad="2" - length="1" - follows="top|left" - font="SansSerif" - height="16" - left="9" - name="account_name_label" - parse_urls="true" - type="string"/> - <panel - layout="topleft" - follows="left|top" - name="panel_buttons" - height="345" - left="9"> - <button - layout="topleft" - follows="left|top" - top_pad="9" - visible="true" - height="23" - label="Connect..." - name="connect_btn" - width="210"> - <commit_callback function="SocialSharing.Connect"/> - </button> - - <button - layout="topleft" - follows="left|top" - top_delta="0" - height="23" - label="Disconnect" - name="disconnect_btn" - width="210" - visible="false"> - <commit_callback function="SocialSharing.Disconnect"/> - </button> - <text - layout="topleft" - length="1" - follows="top|left" - height="16" - left="0" - name="account_learn_more_label" - top_pad="20" - type="string"> - [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Learn about posting to Facebook] - </text> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml index 9d21a3a293..97994fb08b 100644 --- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml +++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml @@ -1,6 +1,6 @@ <panel height="400" - width="304" + width="272" layout="topleft" follows="all" name="panel_facebook_friends"> @@ -9,17 +9,17 @@ value="You currently do not have any Facebook friends who are also Second Life residents. Ask your Facebook friends to join Second Life today!" /> <string name="facebook_friends_no_connected" - value="You're currently not connected to Facebook. Please go to the Account tab to connect and enable this feature." /> + value="You're currently not connected to Facebook. Please go to the Status tab to connect and enable this feature." /> <accordion - background_visible="true" + background_visible="false" bg_alpha_color="DkGray2" bg_opaque_color="DkGray2" follows="all" - height="408" + height="383" layout="topleft" - left="3" + left="10" name="friends_accordion" - right="-2" + right="-10" top_pad="2"> <accordion_tab layout="topleft" @@ -36,7 +36,7 @@ name="second_life_friends" show_permissions_granted="true" top="0" - width="307" /> + width="272" /> </accordion_tab> <accordion_tab layout="topleft" @@ -53,19 +53,20 @@ name="suggested_friends" show_permissions_granted="true" top="0" - width="307" /> + width="272" /> </accordion_tab> </accordion> <text layout="topleft" word_wrap="true" height="64" - width="290" + width="250" follows="top|left|right" font="SansSerif" - left="9" + left="10" + right="-10" name="facebook_friends_status" - top="21" + top="5" type="string"> Not connected to Facebook. </text> diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml index b5b6dee004..22e6598352 100644 --- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml @@ -1,29 +1,19 @@ <panel height="400" - width="304" + width="272" layout="topleft" follows="all" name="panel_facebook_photo"> - <layout_stack - layout="topleft" - border_size="0" - height="392" - follows="all" - orientation="vertical" - name="stack_photo" - top="8"> - <layout_panel - name="snapshot_panel" - height="367"> <combo_box control_name="FacebookPhotoResolution" follows="left|top" - top="6" - left="9" + layout="topleft" + top="7" + left="10" name="resolution_combobox" tool_tip="Image resolution" height="21" - width="135"> + width="124"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -47,13 +37,14 @@ </combo_box> <combo_box control_name="FacebookPhotoFilters" - follows="right|top" + follows="left|top" + layout="topleft" name="filters_combobox" tool_tip="Image filters" - top="6" - left="165" + top="7" + left_pad="4" height="21" - width="135"> + width="124"> <combo_box.item label="No Filter" name="NoFilter" @@ -61,48 +52,62 @@ </combo_box> <panel height="150" - width="250" + width="252" visible="true" + layout="topleft" name="thumbnail_placeholder" - top="33" - follows="left|top|right" - left="9"> + top_pad="5" + follows="left|top|rith" + right="-10" + left="10"> </panel> - <button - follows="left|top" - height="23" - label="Refresh" - left="9" - top_pad="5" - name="new_snapshot_btn" - tool_tip="Click to refresh" - visible="true" - width="100" > - <button.commit_callback - function="SocialSharing.RefreshPhoto" /> - </button> - <text + <text follows="left|top" + layout="topleft" font="SansSerif" text_color="EmphasisColor" height="14" - top_pad="-19" - left_pad="-30" + top_pad="2" + left="10" length="1" halign="center" name="working_lbl" translate="false" type="string" visible="true" - width="150"> + width="251"> Refreshing... </text> + <view_border + bevel_style="in" + follows="left|top" + layout="topleft" + height="1" + left="10" + name="refresh_border" + width="250" + top_pad="0"/> + <button + follows="left|top" + layout="topleft" + height="23" + label="Refresh" + left="10" + top_pad="5" + name="new_snapshot_btn" + tool_tip="Click to refresh" + visible="true" + width="100" > + <button.commit_callback + function="SocialSharing.RefreshPhoto" /> + </button> <button follows="right|top" + layout="topleft" height="23" label="Preview" - left="200" - top_pad="-19" + right="-10" + top_delta="0" name="big_preview_btn" tool_tip="Click to toggle preview" is_toggle="true" @@ -114,9 +119,10 @@ <text length="1" follows="top|left|right" + layout="topleft" font="SansSerif" height="16" - left="9" + left="10" name="caption_label" top_pad="20" type="string"> @@ -124,23 +130,22 @@ </text> <text_editor follows="left|top|right|bottom" + layout="topleft" height="87" width="250" - left="9" + left="10" + right="-10" length="1" max_length="700" name="photo_caption" type="string" word_wrap="true"> </text_editor> - </layout_panel> - <layout_panel - name="photo_button_panel" - height="25"> <button - follows="left|bottom" - top="0" - left="9" + follows="left|top" + layout="topleft" + top_pad="22" + left="10" height="23" label="Post" name="post_photo_btn" @@ -149,16 +154,15 @@ function="SocialSharing.SendPhoto" /> </button> <button - follows="left|bottom" + follows="right|top" + layout="topleft" height="23" label="Cancel" name="cancel_photo_btn" - left_pad="15" + right="-10" top_delta="0" width="100"> <button.commit_callback function="SocialSharing.Cancel" /> - </button> - </layout_panel> - </layout_stack> + </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_facebook_place.xml b/indra/newview/skins/default/xui/en/panel_facebook_place.xml index 84c87df523..f87b008c4e 100644 --- a/indra/newview/skins/default/xui/en/panel_facebook_place.xml +++ b/indra/newview/skins/default/xui/en/panel_facebook_place.xml @@ -1,115 +1,96 @@ <panel height="400" - width="304" + width="272" layout="topleft" follows="all" name="panel_facebook_place"> - <layout_stack - layout="topleft" - border_size="0" - height="392" - follows="all" - orientation="vertical" - name="stack_place" - top="8"> - <layout_panel - name="place_detail_panel" - height="181"> <text length="1" follows="top|left|right" + layout="topleft" font="SansSerif" height="16" - left="9" + left="10" name="place_caption_label" - top="13" + top="5" type="string"> Say something about where you are: </text> <text_editor follows="top|left|right" - height="150" + layout="topleft" + height="70" width="250" - left="9" + left="10" + right="-10" length="1" max_length="700" name="place_caption" type="string" word_wrap="true"> </text_editor> - </layout_panel> - <layout_panel - name="place_map_panel" - height="186"> + <check_box + follows="left|top" + layout="topleft" + initial_value="false" + height="16" + top_pad="8" + width="8" + label="Include overhead view of location" + name="add_place_view_cb" + left="10"/> <panel follows="left|top" - height="128" - width="128" + layout="topleft" + height="243" + width="250" background_visible="true" bg_opaque_color="Black" bg_alpha_color="Black" - top="20" - left="9" + top_pad="8" + left="10" + right="-12" visible="true" name="map_border"> </panel> - <loading_indicator - follows="left|top" - height="24" - width="24" - name="map_loading_indicator" - top="77" - left="61" - visible="true"/> <icon follows="left|top" - height="128" - width="128" + layout="topleft" + height="243" + width="250" image_name="Map_Placeholder_Icon" - layout="topleft" - top="20" - left="9" + top_delta="0" + right="-12" + left="10" visible="true" name="map_placeholder"> </icon> <icon follows="left|top" - height="128" - width="128" + layout="topleft" + height="243" + width="250" image_name="Map_Placeholder_Icon" - layout="topleft" - top="20" - left="9" + top_delta="0" + left="10" + right="-12" visible="true" name="map_default"> </icon> - <check_box + <loading_indicator follows="left|top" - initial_value="false" - top_delta="8" - width="8" - label="" - name="add_place_view_cb" - left_pad="5"/> - <text - follows="left|top" - font="SansSerif" - height="32" - width="130" - word_wrap="true" - left_pad="12" - top_delta="-8" - type="string"> - Include overhead view of location - </text> - </layout_panel> - <layout_panel - name="place_button_panel" - height="25"> + layout="topleft" + height="24" + width="24" + name="map_loading_indicator" + top_delta="116" + left="126" + visible="false"/> <button follows="left|bottom" - top="0" - left="9" + layout="topleft" + top_pad="95" + left="10" height="23" label="Post" name="post_place_btn" @@ -118,16 +99,15 @@ function="SocialSharing.SendCheckin" /> </button> <button - follows="left|bottom" + follows="right|bottom" + layout="topleft" height="23" label="Cancel" name="cancel_place_btn" - left_pad="15" + right="-10" top_delta="0" width="100"> <button.commit_callback function="SocialSharing.Cancel" /> </button> - </layout_panel> - </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_facebook_status.xml b/indra/newview/skins/default/xui/en/panel_facebook_status.xml index 480abec558..fe0f3c9279 100644 --- a/indra/newview/skins/default/xui/en/panel_facebook_status.xml +++ b/indra/newview/skins/default/xui/en/panel_facebook_status.xml @@ -1,50 +1,113 @@ <panel height="400" - width="304" + width="272" follows="all" layout="topleft" name="panel_facebook_status"> - <layout_stack + <string + name="facebook_connected" + value="You are connected to Facebook as:" /> + <string + name="facebook_disconnected" + value="Not connected to Facebook" /> + <text + layout="topleft" + length="1" + follows="top|left" + font="SansSerif" + height="16" + left="10" + name="account_caption_label" + top="5" + type="string"> + Not connected to Facebook. + </text> + <text + layout="topleft" + top_pad="2" + length="1" + follows="top|left" + font="SansSerif" + height="16" + left="10" + name="account_name_label" + parse_urls="true" + type="string"/> + <panel + layout="topleft" + follows="left|top" + name="panel_buttons" + height="60" + left="0"> + <button + layout="topleft" + follows="left|top" + top_pad="9" + left="10" + visible="true" + height="23" + label="Connect..." + name="connect_btn" + width="251"> + <commit_callback function="SocialSharing.Connect"/> + </button> + + <button + layout="topleft" + follows="left|top|right" + top_delta="0" + left="10" + right="-10" + height="23" + label="Disconnect" + name="disconnect_btn" + width="210" + visible="false"> + <commit_callback function="SocialSharing.Disconnect"/> + </button> + <text layout="topleft" - border_size="0" - height="392" - follows="all" - orientation="vertical" - name="stack_status" - top="8"> - <layout_panel - name="status_detail_panel" - height="367"> + length="1" + follows="top|left|right" + left="10" + right="-10" + height="16" + name="account_learn_more_label" + top_pad="5" + type="string"> + [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Learn about posting to Facebook] + </text> + </panel> + <text length="1" + layout="topleft" follows="top|left|right" font="SansSerif" height="16" - left="9" + left="10" name="status_caption_label" - top="13" + top_pad="5" type="string"> What's on your mind? </text> <text_editor follows="left|top|right" + layout="topleft" height="150" - width="250" - left="9" + width="252" + left="10" length="1" max_length="700" name="status_message" type="string" word_wrap="true"> </text_editor> - </layout_panel> - <layout_panel - name="status_button_panel" - height="25"> <button - follows="left|bottom" - top="0" - left="9" + follows="left|top" + layout="topleft" + top_pad="6" + left="10" height="23" label="Post" name="post_status_btn" @@ -53,16 +116,15 @@ function="SocialSharing.SendStatus" /> </button> <button - follows="left|bottom" + follows="right|top" + layout="topleft" height="23" label="Cancel" name="cancel_status_btn" - left_pad="15" + right="-10" top_delta="0" width="100"> <button.commit_callback function="SocialSharing.Cancel" /> </button> - </layout_panel> - </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_flickr_account.xml b/indra/newview/skins/default/xui/en/panel_flickr_account.xml index 506d2e2f74..5c2f335780 100644 --- a/indra/newview/skins/default/xui/en/panel_flickr_account.xml +++ b/indra/newview/skins/default/xui/en/panel_flickr_account.xml @@ -1,6 +1,6 @@ <panel height="540" - width="304" + width="272" layout="topleft" name="panel_flickr_account"> <string @@ -15,9 +15,9 @@ follows="top|left" font="SansSerif" height="16" - left="9" + left="10" name="account_caption_label" - top="21" + top="5" type="string"> Not connected to Flickr. </text> @@ -28,7 +28,7 @@ follows="top|left" font="SansSerif" height="16" - left="9" + left="10" name="account_name_label" parse_urls="true" type="string"/> @@ -36,12 +36,14 @@ layout="topleft" name="panel_buttons" height="345" - left="9"> + left="0"> <button layout="topleft" - follows="left|top" + follows="left|top|right" top_pad="9" visible="true" + left="10" + right="-10" height="23" label="Connect..." name="connect_btn" @@ -51,8 +53,10 @@ <button layout="topleft" - follows="left|top" + follows="left|top|right" top_delta="0" + left="10" + right="-10" height="23" label="Disconnect" name="disconnect_btn" @@ -65,9 +69,9 @@ length="1" follows="top|left" height="16" - left="0" + left="10" name="account_learn_more_label" - top_pad="20" + top_pad="5" type="string"> [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Learn about posting to Flickr] </text> diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml index 8d8ef45c0d..e31695645d 100644 --- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml @@ -1,28 +1,19 @@ <panel height="540" - width="304" + width="272" + follows="all" layout="topleft" name="panel_flickr_photo"> - <layout_stack - layout="topleft" - border_size="0" - height="532" - follows="all" - orientation="vertical" - name="stack_photo" - top="8"> - <layout_panel - name="snapshot_panel" - height="507"> <combo_box control_name="FlickrPhotoResolution" follows="left|top" - top="6" - left="9" + layout="topleft" + top="7" + left="10" name="resolution_combobox" tool_tip="Image resolution" height="21" - width="135"> + width="124"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -42,13 +33,14 @@ </combo_box> <combo_box control_name="FlickrPhotoFilters" - follows="right|top" + follows="left|top" + layout="topleft" name="filters_combobox" tool_tip="Image filters" - top="6" - left="165" + top_delta="0" + left_pad="4" height="21" - width="135"> + width="124"> <combo_box.item label="No Filter" name="NoFilter" @@ -59,45 +51,59 @@ width="250" visible="true" name="thumbnail_placeholder" - top="33" - follows="left|top" - left="9"> + top_pad="5" + follows="left|top|right" + layout="topleft" + right="-10" + left="10"> </panel> - <button - follows="left|top" - height="23" - label="Refresh" - left="9" - top_pad="5" - name="new_snapshot_btn" - tool_tip="Click to refresh" - visible="true" - width="100" > - <button.commit_callback - function="SocialSharing.RefreshPhoto" /> - </button> - <text + <text follows="left|top" + layout="topleft" font="SansSerif" text_color="EmphasisColor" height="14" - top_pad="-19" - left_pad="-30" + top_pad="2" + left="10" length="1" halign="center" name="working_lbl" translate="false" type="string" visible="true" - width="150"> + width="251"> Refreshing... </text> + <view_border + bevel_style="in" + follows="left|top" + layout="topleft" + height="1" + left="10" + name="refresh_border" + width="250" + top_pad="0"/> + <button + follows="left|top" + layout="topleft" + height="23" + label="Refresh" + left="10" + top_pad="5" + name="new_snapshot_btn" + tool_tip="Click to refresh" + visible="true" + width="100" > + <button.commit_callback + function="SocialSharing.RefreshPhoto" /> + </button> <button follows="right|top" + layout="topleft" height="23" label="Preview" - left="200" - top_pad="-19" + right="-10" + top_delta="0" name="big_preview_btn" tool_tip="Click to toggle preview" is_toggle="true" @@ -109,19 +115,21 @@ <text length="1" follows="top|left|right" + layout="topleft" font="SansSerif" height="16" - left="9" + left="10" name="title_label" - top_pad="15" + top_pad="10" type="string"> Title: </text> <line_editor follows="left|top" + layout="topleft" height="20" width="250" - left="9" + left="10" length="1" max_length="256" name="photo_title" @@ -130,19 +138,23 @@ <text length="1" follows="top|left|right" + layout="topleft" font="SansSerif" height="16" - left="9" + left="10" + right="-10" name="description_label" top_pad="10" + width="25" type="string"> Description: </text> <text_editor follows="left|top" + layout="topleft" height="50" - width="250" - left="9" + width="249" + left="10" length="1" max_length="700" name="photo_description" @@ -151,6 +163,7 @@ </text_editor> <check_box follows="left|top" + layout="topleft" initial_value="true" label="Include SL location at end of description" name="add_location_cb" @@ -159,23 +172,25 @@ top_pad="8"/> <text length="1" - follows="top|left|right" + follows="top|left" + layout="topleft" font="SansSerif" height="16" - left="9" + left="10" name="tags_label" - top_pad="10" + top_pad="6" type="string"> Tags: </text> <text length="1" follows="top|left" + layout="topleft" font="SansSerifSmall" text_color="White_50" height="30" name="tags_help_label" - left="50" + left="51" top_pad="-16" type="string"> Separate tags with spaces @@ -183,9 +198,10 @@ Use "" for multi-word tags </text> <text_editor follows="left|top" + layout="topleft" height="50" - width="250" - left="9" + width="249" + left="10" length="1" max_length="700" name="photo_tags" @@ -195,8 +211,9 @@ Use "" for multi-word tags <combo_box control_name="FlickrPhotoRating" follows="left|top" - top_pad="16" - left="9" + layout="topleft" + top_pad="7" + left="10" name="rating_combobox" tool_tip="Flickr content rating" height="21" @@ -214,14 +231,11 @@ Use "" for multi-word tags name="RestrictedRating" value="3" /> </combo_box> - </layout_panel> - <layout_panel - name="photo_button_panel" - height="25"> <button follows="left|top" - top="0" - left="9" + layout="topleft" + top_pad="7" + left="10" height="23" label="Upload" name="post_photo_btn" @@ -230,16 +244,15 @@ Use "" for multi-word tags function="SocialSharing.SendPhoto" /> </button> <button - follows="left|top" + follows="right|top" + layout="topleft" height="23" label="Cancel" name="cancel_photo_btn" - left_pad="15" + right="-10" top_delta="0" width="100"> <button.commit_callback function="SocialSharing.Cancel" /> - </button> - </layout_panel> - </layout_stack> + </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml index ab2a42ea01..331a08b4bb 100755 --- a/indra/newview/skins/default/xui/en/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - height="380" + height="319" layout="topleft" name="panel_postcard_message" width="490"> @@ -12,7 +12,7 @@ font="SansSerif" height="16" layout="topleft" - left="12" + left="5" name="to_label" top="10" width="60"> @@ -25,7 +25,7 @@ layout="topleft" left_pad="10" name="to_form" - right="-10" + right="-3" top_delta="-4" /> <text type="string" @@ -35,7 +35,7 @@ font="SansSerif" height="16" layout="topleft" - left="12" + left="5" name="name_label" width="60"> From: @@ -47,7 +47,7 @@ left_pad="10" max_length_bytes="100" name="name_form" - right="-10" + right="-3" top_delta="-4" /> <text type="string" @@ -57,7 +57,7 @@ font="SansSerif" height="16" layout="topleft" - left="12" + left="5" name="subject_label" width="60"> Subject: @@ -65,61 +65,24 @@ <line_editor follows="left|top|right" height="20" - label="Type your subject here." layout="topleft" left_pad="10" max_length_bytes="100" name="subject_form" - right="-10" + right="-3" top_delta="-4" /> - <text - type="string" - length="1" - bottom_delta="23" - follows="top|left|right" - font="SansSerif" - layout="topleft" - left="12" - name="msg_label" - right="-10"> - Message: - </text> <text_editor type="string" length="1" follows="left|top|right" - height="60" + height="48" layout="topleft" - left_delta="0" + left="5" max_length="700" name="msg_form" - right="-10" - top_pad="10" + right="-4" + top_pad="5" word_wrap="true"> Type your message here. </text_editor> - <button - follows="right|bottom" - height="23" - label="Cancel" - layout="topleft" - name="cancel_btn" - right="-32" - top="350" - width="100"> - <button.commit_callback - function="Postcard.Cancel" /> - </button> - <button - follows="right|bottom" - height="23" - label="Send" - layout="topleft" - left_delta="-106" - name="send_btn" - top_delta="0" - width="100"> - <button.commit_callback - function="Postcard.Send" /> - </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml index 3f67a48b14..525149d7ee 100755 --- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml @@ -9,10 +9,10 @@ height="23" label="Resolution" layout="topleft" - left="10" + left="5" name="postcard_size_combo" - right="-10" - top_pad="10"> + right="-3" + top_pad="5"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -34,103 +34,55 @@ name="Custom" value="[i-1,i-1]" /> </combo_box> - <layout_stack - animate="false" - follows="all" - height="275" - layout="bottomleft" - name="postcard_image_params_ls" - left_delta="0" - orientation="vertical" - top_pad="10" - right="-10"> - <layout_panel - follows="top|left|right" - height="60" - layout="topleft" - left="0" - name="postcard_image_size_lp" - auto_resize="false" - top="0" - right="-1" - visible="true"> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Width" - label_width="40" - layout="topleft" - left="10" - max_val="6016" - min_val="32" - name="postcard_snapshot_width" - top_pad="10" - width="95" /> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Height" - label_width="40" - layout="topleft" - left_pad="5" - max_val="6016" - min_val="32" - name="postcard_snapshot_height" - top_delta="0" - width="95" /> - <check_box - height="10" - bottom_delta="20" - follows="left|top" - label="Constrain proportions" - layout="topleft" - left="10" - name="postcard_keep_aspect_check" /> - </layout_panel> - <layout_panel - follows="top|left|right" - height="23" - layout="topleft" - left="0" - name="postcard_image_format_quality_lp" - auto_resize="true" - top="0" - right="-1" - visible="true"> - <slider - decimal_digits="0" - follows="left|top" - height="15" - increment="1" - initial_value="75" - label="Image quality" - label_width="80" - layout="topleft" - left="0" - max_val="100" - name="image_quality_slider" - top_pad="7" - width="190" /> - <text - type="string" - follows="left|top" - font="SansSerifSmall" - length="1" - height="14" - layout="topleft" - left_pad="-5" - halign="left" - name="image_quality_level" - top_delta="0" - width="60"> - ([QLVL]) - </text> - </layout_panel> - </layout_stack> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Width x Height" + label_width="90" + layout="topleft" + left="5" + max_val="6016" + min_val="32" + name="postcard_snapshot_width" + top_pad="5" + width="144" /> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="" + label_width="0" + layout="topleft" + left_pad="0" + max_val="6016" + min_val="32" + name="postcard_snapshot_height" + top_delta="0" + width="52" /> + <check_box + top_pad="12" + follows="left|top" + label="Constrain proportions" + layout="topleft" + left="5" + name="postcard_keep_aspect_check" /> + <slider + decimal_digits="0" + follows="left|top" + height="15" + increment="1" + initial_value="75" + label="Quality:" + label_width="45" + layout="topleft" + left="5" + max_val="100" + name="image_quality_slider" + top_pad="6" + width="190" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml index 71d808fa4b..ea579c6dae 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml @@ -12,12 +12,12 @@ left="12" mouse_opaque="true" name="title_icon" - top="5" + top="6" width="18" /> <text follows="top|left|right" font="SansSerifBold" - height="20" + height="14" layout="topleft" left_pad="12" length="1" @@ -25,46 +25,28 @@ right="-10" text_color="white" type="string" - top_delta="5"> - Save to My Inventory + top_delta="3"> + Inventory </text> <view_border bevel_style="in" follows="left|top|right" height="1" - left="10" + left="9" layout="topleft" name="hr" - right="-10" + right="-5" top_pad="5" /> - <text - bottom="35" - follows="top|left|right" - font="SansSerif" - height="56" - layout="topleft" - left="12" - length="1" - name="hint_lbl" - top_pad="10" - type="string" - word_wrap="true"> - Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats. - </text> <combo_box follows="top|left|right" - height="23" + height="20" label="Resolution" layout="topleft" left_delta="0" name="texture_size_combo" - right="-10" - top_pad="10"> - <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> + right="-5" + top_pad="5"> <combo_box.item label="Small (128x128)" name="Small(128x128)" @@ -88,61 +70,74 @@ follows="left|top" height="20" increment="32" - label="Width" - label_width="40" + label="Width x Height" + label_width="90" layout="topleft" left="10" max_val="6016" min_val="32" name="inventory_snapshot_width" - top_pad="10" - width="95" /> + top_pad="7" + width="144" /> <spinner allow_text_entry="false" decimal_digits="0" follows="left|top" height="20" increment="32" - label="Height" - label_width="40" + label="" + label_width="0" layout="topleft" - left_pad="5" + left_pad="0" max_val="6016" min_val="32" name="inventory_snapshot_height" top_delta="0" - width="95" /> + width="54" /> <check_box - bottom_delta="20" - height="10" + top_pad="12" follows="left|top" label="Constrain proportions" layout="topleft" left="10" name="inventory_keep_aspect_check" visible="false" /> + <text + follows="top|left" + font="SansSerif" + height="56" + layout="topleft" + left="10" + length="1" + name="hint_lbl" + top_pad="6" + width="200" + type="string" + word_wrap="true"> + Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats. + </text> <button follows="right|bottom" height="23" label="Cancel" layout="topleft" name="cancel_btn" - right="-32" - top="350" - width="100"> + right="-5" + top="337" + width="97"> <button.commit_callback function="Inventory.Cancel" /> </button> <button - follows="right|bottom" + follows="left|bottom" height="23" label="Save" layout="topleft" - left_delta="-106" + left="10" name="save_btn" top_delta="0" - width="100"> + width="97"> <button.commit_callback function="Inventory.Save" /> </button> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml index 781ab17403..188c9f8707 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml @@ -12,12 +12,12 @@ left="12" mouse_opaque="true" name="title_icon" - top="5" + top="7" width="18" /> <text follows="top|left|right" font="SansSerifBold" - height="20" + height="14" layout="topleft" left_pad="12" length="1" @@ -25,28 +25,27 @@ right="-10" text_color="white" type="string" - top_delta="4"> - Save to My Computer + top_delta="2"> + Disk </text> <view_border bevel_style="in" follows="left|top|right" height="1" - left="10" + left="9" layout="topleft" name="hr" - right="-10" - top_pad="5" - /> + right="-5" + top_pad="5"/> <combo_box follows="left|top|right" - height="23" + height="20" label="Resolution" layout="topleft" left_delta="0" name="local_size_combo" - right="-10" - top_pad="10"> + right="-5" + top_pad="5"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -80,149 +79,114 @@ name="Custom" value="[i-1,i-1]" /> </combo_box> - <layout_stack - animate="false" - follows="all" - height="275" - layout="bottomleft" - name="local_image_params_ls" - left_delta="0" - orientation="vertical" - top_pad="10" - right="-10"> - <layout_panel - follows="top|left|right" - height="60" - layout="topleft" - left="0" - name="local_image_size_lp" - auto_resize="false" - top="0" - right="-1" - visible="true"> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Width" - label_width="40" - layout="topleft" - left="10" - max_val="6016" - min_val="32" - name="local_snapshot_width" - top_pad="10" - width="95" /> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Height" - label_width="40" - layout="topleft" - left_pad="5" - max_val="6016" - min_val="32" - name="local_snapshot_height" - top_delta="0" - width="95" /> - <check_box - bottom_delta="20" - height="10" - follows="left|top" - label="Constrain proportions" - layout="topleft" - left="10" - name="local_keep_aspect_check" /> - </layout_panel> - <layout_panel - follows="top|left|right" - height="23" - layout="topleft" - left="0" - name="local_image_format_quality_lp" - auto_resize="true" - top="0" - right="-1" - visible="true"> - <combo_box - follows="left|top" - height="23" - label="Format" - layout="topleft" - left_delta="0" - name="local_format_combo" - top_pad="0" - width="120"> - <combo_box.item - label="PNG (Lossless)" - name="PNG" - value="PNG" /> - <combo_box.item - label="JPEG" - name="JPEG" - value="JPEG" /> - <combo_box.item - label="BMP (Lossless)" - name="BMP" - value="BMP" /> - </combo_box> - <slider - decimal_digits="0" - follows="left|top" - height="15" - increment="1" - initial_value="75" - label="Image quality" - label_width="80" - layout="topleft" - left="10" - max_val="100" - name="image_quality_slider" - top_pad="7" - width="200" /> - <text - type="string" - follows="left|top" - font="SansSerifSmall" - length="1" - height="14" - layout="topleft" - left_pad="-5" - halign="left" - name="image_quality_level" - top_delta="0" - width="60"> - ([QLVL]) - </text> - </layout_panel> - </layout_stack> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Width x Height" + label_width="90" + layout="topleft" + left="10" + max_val="6016" + min_val="32" + name="local_snapshot_width" + top_pad="7" + width="144" /> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="" + label_width="0" + layout="topleft" + left_pad="0" + max_val="6016" + min_val="32" + name="local_snapshot_height" + top_delta="0" + width="54" /> + <check_box + top_pad="12" + follows="left|top" + label="Constrain proportions" + layout="topleft" + left="10" + name="local_keep_aspect_check" /> + <text + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left="10" + name="local_format_label" + top_pad="7" + width="50"> + Format: + </text> + <combo_box + follows="left|top|right" + height="20" + label="Format" + layout="topleft" + left="65" + right="-5" + name="local_format_combo" + top_delta="-3" + width="120"> + <combo_box.item + label="PNG (Lossless)" + name="PNG" + value="PNG" /> + <combo_box.item + label="JPEG" + name="JPEG" + value="JPEG" /> + <combo_box.item + label="BMP (Lossless)" + name="BMP" + value="BMP" /> + </combo_box> + <slider + decimal_digits="0" + follows="left|top" + height="15" + increment="1" + initial_value="75" + label="Quality:" + label_width="45" + layout="topleft" + left="10" + max_val="100" + name="image_quality_slider" + top_pad="6" + width="203" /> <button follows="right|bottom" height="23" label="Cancel" layout="topleft" name="cancel_btn" - right="-32" - top="350" - width="100"> + right="-5" + top="337" + width="97"> <button.commit_callback function="Local.Cancel" /> </button> <flyout_button - follows="right|bottom" + follows="left|bottom" height="23" label="Save" layout="topleft" - left_delta="-106" + left="10" name="save_btn" tool_tip="Save image to a file" top_delta="0" - width="100"> + width="97"> <flyout_button.item label="Save" name="save_item" @@ -232,4 +196,4 @@ name="saveas_item" value="save as" /> </flyout_button> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml index eff60f8228..265217ef60 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml @@ -4,117 +4,124 @@ height="240" layout="topleft" name="panel_snapshot_options" - width="490"> + width="208"> + <button + follows="left|top" + font="SansSerif" + halign="left" + height="22" + image_overlay="Snapshot_Download" + image_overlay_alignment="left" + image_top_pad="-0" + imgoverlay_label_space="10" + label="Save to Disk" + layout="topleft" + left="9" + name="save_to_computer_btn" + top_pad="9"> + <button.commit_callback + function="Snapshot.SaveToComputer" /> + </button> <button - follows="left|top|right" + follows="left|top" font="SansSerif" halign="left" - height="38" - image_overlay="Snapshot_Profile" + height="22" + image_overlay="Snapshot_Inventory" image_overlay_alignment="left" - image_top_pad="-2" + image_top_pad="-1" imgoverlay_label_space="10" - label="Post to My Profile Feed" + label="Save to Inventory (L$[AMOUNT])" layout="topleft" left_delta="0" + name="save_to_inventory_btn" + top_pad="5"> + <button.commit_callback + function="Snapshot.SaveToInventory" /> + </button> + <button + follows="left|top" + font="SansSerif" + halign="left" + height="22" + image_overlay="Snapshot_Profile" + image_overlay_alignment="left" + image_top_pad="-1" + imgoverlay_label_space="10" + label="Upload to Profile" + layout="topleft" name="save_to_profile_btn" - pad_left="10" - right="-10" - top_pad="10"> + left_delta="0" + top_pad="5"> <button.commit_callback function="Snapshot.SaveToProfile" /> </button> <button - follows="left|top|right" + follows="left|top" font="SansSerif" halign="left" - height="38" - image_overlay="Snapshot_Email" + height="22" + image_overlay="Snapshot_Facebook" image_overlay_alignment="left" - image_top_pad="-2" + image_top_pad="0" imgoverlay_label_space="10" - label="Email" + label="Upload to Facebook" layout="topleft" left_delta="0" - name="save_to_email_btn" - pad_left="10" - right="-10" - top_pad="10"> + name="send_to_facebook_btn" + top_pad="5"> <button.commit_callback - function="Snapshot.SaveToEmail" /> + function="Snapshot.SendToFacebook"/> </button> <button - follows="left|top|right" + follows="left|top" font="SansSerif" halign="left" - height="38" - image_overlay="Snapshot_Inventory" + height="22" + image_overlay="Command_Twitter_Icon" image_overlay_alignment="left" - image_top_pad="-2" + image_top_pad="0" imgoverlay_label_space="10" - label="Save to My Inventory (L$[AMOUNT])" + label="Upload to Twitter" layout="topleft" left_delta="0" - name="save_to_inventory_btn" - pad_left="10" - right="-10" - top_pad="10"> + name="send_to_twitter_btn" + top_pad="5"> <button.commit_callback - function="Snapshot.SaveToInventory" /> + function="Snapshot.SendToTwitter"/> </button> <button - follows="left|top|right" + follows="left|top" font="SansSerif" halign="left" - height="38" - image_overlay="Snapshot_Download" + height="22" + image_overlay="Command_Flickr_Icon" image_overlay_alignment="left" - image_top_pad="-2" + image_top_pad="0" imgoverlay_label_space="10" - label="Save to My Computer" + label="Upload to Flickr" layout="topleft" left_delta="0" - name="save_to_computer_btn" - pad_left="10" - right="-10" - top_pad="10"> + name="send_to_flickr_btn" + top_pad="5"> <button.commit_callback - function="Snapshot.SaveToComputer" /> + function="Snapshot.SendToFlickr"/> + </button> + <button + follows="left|top" + font="SansSerif" + halign="left" + height="22" + image_overlay="Snapshot_Email" + image_overlay_alignment="left" + image_top_pad="0" + imgoverlay_label_space="10" + label="Send via E-mail" + layout="topleft" + left_delta="0" + name="save_to_email_btn" + top_pad="5"> + <button.commit_callback + function="Snapshot.SaveToEmail" /> </button> - <text - font="SansSerif" - layout="topleft" - length="1" - follows="top|left" - height="16" - left="10" - name="send_to_facebook_textbox" - top_pad="10" - type="string"> - Send to: [secondlife:/// Facebook] - </text> - <text - font="SansSerif" - layout="topleft" - length="1" - follows="top|left" - height="16" - left="140" - name="send_to_twitter_textbox" - top_pad="-16" - type="string"> - [secondlife:/// Twitter] - </text> - <text - font="SansSerif" - layout="topleft" - length="1" - follows="top|left" - height="16" - left="190" - name="send_to_flickr_textbox" - top_pad="-16" - type="string"> - [secondlife:/// Flickr] - </text> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml index ebba292a93..975b08be05 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml @@ -24,12 +24,12 @@ left="12" mouse_opaque="true" name="title_icon" - top="5" + top="7" width="18" /> <text follows="top|left|right" font="SansSerifBold" - height="20" + height="14" layout="topleft" left_pad="12" length="1" @@ -37,63 +37,67 @@ right="-10" text_color="white" type="string" - top_delta="3"> - Email + top_delta="2"> + E-mail </text> - <button - follows="right|top" - height="23" - is_toggle="true" - label="Message" - layout="topleft" - name="message_btn" - right="-82" - top_delta="-7" - width="70"> - <button.commit_callback - function="Postcard.Message" /> - </button> - <button - follows="right|top" - height="23" - is_toggle="true" - label="Settings" - layout="topleft" - name="settings_btn" - top_delta="0" - right="-10" - width="70"> - <button.commit_callback - function="Postcard.Settings" /> - </button> <view_border bevel_style="in" follows="left|top|right" height="1" - left="10" + left="9" layout="topleft" name="hr" - right="-10" + right="-5" top_pad="5" /> - <panel_container + <tab_container + name="postcard_tabs" + tab_group="1" + tab_min_width="97" + tab_height="21" + tab_position="top" + top_pad="7" + left="5" + right="-2" + height="319" follows="all" - height="340" - layout="topleft" - left="0" - name="postcard_panel_container" - default_panel_name="panel_postcard_message" - top_pad="10" - width="490"> + halign="center" + use_highlighting_on_hover="true"> <panel follows="all" layout="topleft" + label="Message" name="panel_postcard_message" filename="panel_postcard_message.xml" /> <panel follows="all" layout="topleft" + label="Settings" name="panel_postcard_settings" filename="panel_postcard_settings.xml" /> - </panel_container> -</panel> + </tab_container> + <button + follows="right|bottom" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + right="-6" + bottom="-20" + width="97"> + <button.commit_callback + function="Postcard.Cancel" /> + </button> + <button + follows="left|bottom" + height="23" + label="Send" + layout="topleft" + left="10" + name="send_btn" + top_delta="0" + width="97"> + <button.commit_callback + function="Postcard.Send" /> + </button> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml index 0dd357aa1a..d86cb92981 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml @@ -12,12 +12,12 @@ left="12" mouse_opaque="true" name="title_icon" - top="5" + top="7" width="18" /> <text follows="top|left|right" font="SansSerifBold" - height="20" + height="14" layout="topleft" left_pad="12" length="1" @@ -26,27 +26,28 @@ text_color="white" type="string" top_delta="4"> - Post to My Profile Feed + Profile </text> <view_border bevel_style="in" follows="left|top|right" height="1" - left="10" + left="9" layout="topleft" name="hr" - right="-10" + right="-5" top_pad="5" /> <combo_box - follows="left|top" + follows="left|top|right" height="23" label="Resolution" layout="topleft" - left_delta="0" + left="10" + right="-5" name="profile_size_combo" - top_pad="10" - width="250"> + top_pad="5" + width="180"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -68,132 +69,99 @@ name="Custom" value="[i-1,i-1]" /> </combo_box> - <layout_stack - animate="false" - follows="all" - height="270" - layout="bottomleft" - name="profile_image_params_ls" + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Width x Height" + label_width="90" + layout="topleft" + left="10" + max_val="6016" + min_val="32" + name="profile_snapshot_width" + top_pad="7" + width="144" /> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="" + label_width="0" + layout="topleft" + left_pad="0" + max_val="6016" + min_val="32" + name="profile_snapshot_height" + top_delta="0" + width="54" /> + <check_box + top_pad="12" + label="Constrain proportions" + layout="topleft" + left="10" + name="profile_keep_aspect_check" /> + <text + length="1" + follows="top|left|right" + height="16" + layout="topleft" + left="12" + name="caption_label" + right="-10" + top_pad="4" + type="string"> + Caption: + </text> + <text_editor + follows="top|left|right" + height="35" + layout="topleft" + left="10" + right="-5" + length="1" + max_length="700" + name="caption" + width="200" + top_pad="2" + type="string" + word_wrap="true"> + </text_editor> + <check_box + follows="left|top" + initial_value="true" + label="Include location" + layout="topleft" left_delta="0" - orientation="vertical" - top_pad="10" - right="-10"> - <layout_panel - follows="top|left|right" - height="55" - layout="topleft" - left="0" - name="profile_image_size_lp" - auto_resize="false" - top="0" - right="-1" - visible="true"> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Width" - label_width="40" - layout="topleft" - left="10" - max_val="6016" - min_val="32" - name="profile_snapshot_width" - top_pad="10" - width="95" /> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Height" - label_width="40" - layout="topleft" - left_pad="5" - max_val="6016" - min_val="32" - name="profile_snapshot_height" - top_delta="0" - width="95" /> - <check_box - height="10" - bottom_delta="20" - label="Constrain proportions" - layout="topleft" - left="10" - name="profile_keep_aspect_check" /> - </layout_panel> - <layout_panel - follows="top|left|right" - height="200" - layout="topleft" - left="0" - name="profile_image_metadata_lp" - auto_resize="true" - top="0" - right="-1" - visible="true"> - <text - length="1" - follows="top|left|right" - font="SansSerif" - height="16" - layout="topleft" - left="0" - name="caption_label" - right="-10" - top_pad="0" - type="string"> - Caption: - </text> - <text_editor - follows="all" - height="155" - layout="topleft" - left_delta="0" - length="1" - max_length="700" - name="caption" - right="-10" - top_pad="5" - type="string" - word_wrap="true"> - </text_editor> - <check_box - follows="left|bottom" - initial_value="true" - label="Include location" - layout="topleft" - left_delta="0" - name="add_location_cb" - top_pad="15" /> - </layout_panel> - </layout_stack> + height="18" + name="add_location_cb" + top_pad="3" /> <button follows="right|bottom" height="23" label="Cancel" layout="topleft" name="cancel_btn" - right="-32" - top="350" - width="100"> + right="-5" + top="337" + width="97"> <button.commit_callback function="PostToProfile.Cancel" /> </button> <button - follows="right|bottom" + follows="left|bottom" height="23" label="Post" layout="topleft" - left_delta="-106" + left="10" name="post_btn" top_delta="0" - width="100"> + width="97"> <button.commit_callback function="PostToProfile.Send" /> </button> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 426c0c4915..cb6b2fafd8 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -36,8 +36,9 @@ <color_swatch can_apply_immediately="true" follows="left|top" - height="45" + height="22" label="" + label_height="0" layout="topleft" left="10" name="colorswatch" diff --git a/indra/newview/skins/default/xui/en/panel_twitter_account.xml b/indra/newview/skins/default/xui/en/panel_twitter_account.xml index ee4f6396e1..b9049a0bba 100644 --- a/indra/newview/skins/default/xui/en/panel_twitter_account.xml +++ b/indra/newview/skins/default/xui/en/panel_twitter_account.xml @@ -1,6 +1,6 @@ <panel height="400" - width="304" + width="272" layout="topleft" name="panel_twitter_account"> <string @@ -15,9 +15,9 @@ follows="top|left" font="SansSerif" height="16" - left="9" + left="10" name="account_caption_label" - top="21" + top="5" type="string"> Not connected to Twitter. </text> @@ -28,19 +28,23 @@ follows="top|left" font="SansSerif" height="16" - left="9" + left="10" name="account_name_label" parse_urls="true" type="string"/> <panel layout="topleft" + follows="top|left" name="panel_buttons" height="345" - left="9"> + top_pad="3" + left="0"> <button layout="topleft" - follows="left|top" + follows="left|top|right" top_pad="9" + left="10" + right="-10" visible="true" height="23" label="Connect..." @@ -51,8 +55,10 @@ <button layout="topleft" - follows="left|top" + follows="left|top|right" top_delta="0" + left="10" + right="-10" height="23" label="Disconnect" name="disconnect_btn" @@ -65,9 +71,9 @@ length="1" follows="top|left" height="16" - left="0" + left="10" name="account_learn_more_label" - top_pad="20" + top_pad="5" type="string"> [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Learn about posting to Twitter] </text> diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml index c2be56da21..9a460ceead 100644 --- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml @@ -3,31 +3,22 @@ width="304" layout="topleft" name="panel_twitter_photo"> - <layout_stack - layout="topleft" - border_size="0" - height="412" - follows="all" - orientation="vertical" - name="stack_photo" - top="8"> - <layout_panel - name="text_panel" - height="160"> <text length="1" + layout="topleft" follows="top|left|right" font="SansSerif" height="16" - left="9" + left="10" name="status_label" - top="3" + top="5" type="string"> What's happening? </text> <text length="1" follows="top|left" + layout="topleft" font="SansSerif" text_color="EmphasisColor" halign="right" @@ -35,15 +26,16 @@ width="30" left="227" name="status_counter_label" - top="3" + top="5" type="string"> 140 </text> <text_editor follows="left|top" + layout="topleft" height="87" width="250" - left="9" + left="10" length="1" max_length="140" name="photo_status" @@ -52,33 +44,32 @@ </text_editor> <check_box follows="left|top" + layout="topleft" initial_value="true" label="Include SL location" name="add_location_cb" - left="9" + left="10" height="16" - top_pad="10"/> + top_pad="8"/> <check_box follows="left|top" + layout="topleft" initial_value="true" label="Include a photo" name="add_photo_cb" - left="9" + left="10" height="16" - top_pad="10"/> - </layout_panel> - <layout_panel - name="snapshot_panel" - height="227"> + top_pad="1"/> <combo_box control_name="TwitterPhotoResolution" follows="left|top" - top="6" - left="9" + layout="topleft" + top_pad="5" + left="10" name="resolution_combobox" tool_tip="Image resolution" height="21" - width="135"> + width="124"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -99,61 +90,76 @@ <combo_box control_name="TwitterPhotoFilters" follows="right|top" + layout="topleft" name="filters_combobox" tool_tip="Image filters" - top="6" - left="165" + top_delta="0" + right="-10" height="21" - width="135"> + width="124"> <combo_box.item label="No Filter" name="NoFilter" value="NoFilter" /> </combo_box> <panel + layout="topleft" height="150" width="250" visible="true" name="thumbnail_placeholder" - top="33" - follows="left|top" - left="9"> + top_pad="5" + right="-10" + follows="left|top|right" + left="10"> </panel> - <button - follows="left|top" - height="23" - label="Refresh" - left="9" - top_pad="5" - name="new_snapshot_btn" - tool_tip="Click to refresh" - visible="true" - width="100" > - <button.commit_callback - function="SocialSharing.RefreshPhoto" /> - </button> - <text + <text follows="left|top" + layout="topleft" font="SansSerif" text_color="EmphasisColor" height="14" - top_pad="-19" - left_pad="-30" + top_pad="2" + left="10" length="1" halign="center" name="working_lbl" translate="false" type="string" visible="true" - width="150"> + width="251"> Refreshing... </text> + <view_border + bevel_style="in" + follows="left|top" + layout="topleft" + height="1" + left="10" + name="refresh_border" + width="250" + top_pad="0"/> + <button + follows="left|top" + layout="topleft" + height="23" + label="Refresh" + left="10" + top_pad="5" + name="new_snapshot_btn" + tool_tip="Click to refresh" + visible="true" + width="100" > + <button.commit_callback + function="SocialSharing.RefreshPhoto" /> + </button> <button follows="right|top" + layout="topleft" height="23" label="Preview" - left="200" - top_pad="-19" + right="-10" + top_delta="0" name="big_preview_btn" tool_tip="Click to toggle preview" is_toggle="true" @@ -162,14 +168,11 @@ <button.commit_callback function="SocialSharing.BigPreview" /> </button> - </layout_panel> - <layout_panel - name="photo_button_panel" - height="25"> <button follows="left|top" - top="0" - left="9" + layout="topleft" + top_pad="3" + left="10" height="23" label="Tweet" name="post_photo_btn" @@ -178,16 +181,15 @@ function="SocialSharing.SendPhoto" /> </button> <button - follows="left|top" + follows="right|top" + layout="topleft" height="23" label="Cancel" name="cancel_photo_btn" - left_pad="15" + right="-10" top_delta="0" width="100"> <button.commit_callback function="SocialSharing.Cancel" /> </button> - </layout_panel> - </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index fdf41991cd..5a9a16d344 100755 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml @@ -48,7 +48,10 @@ Go to 'Welcome Island Public' to repeat the tutorial. <message name="MustGetAgeRegion"> You must be age 18 or over to enter this region. </message> - </message_set> + <message name="RegionTPSpecialUsageBlocked"> + Unable to enter region. '[REGION_NAME]' is a Skill Gaming Region, and you must meet certain criteria in order to enter. For details, please review the [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ]. + </message> + </message_set> <message_set name="progress"> <message name="sending_dest"> Sending to destination. |