diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-25 21:54:09 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-25 21:54:09 -0800 |
| commit | d220657d8525ccfa246e0f49904e18cc36458b28 (patch) | |
| tree | 2405915c3d04247d3a66f52d071d43684ad9d7e9 /indra/newview/skins | |
| parent | 3fbaff17bf65a826dd8b9bd50dc460aacaa3cb00 (diff) | |
ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses the thumbnail for the moment
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_big_preview.xml | 25 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 17 |
2 files changed, 40 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_big_preview.xml b/indra/newview/skins/default/xui/en/floater_big_preview.xml new file mode 100644 index 0000000000..23698ccc40 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_big_preview.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<floater + positioning="cascading" + can_close="true" + can_resize="false" + can_minimize="false" + help_topic="floater_big_preview" + layout="topleft" + name="floater_big_preview" + save_rect="true" + single_instance="true" + reuse_instance="true" + title="PREVIEW" + height="465" + width="770"> + <panel + height="450" + width="750" + visible="true" + name="big_preview_placeholder" + top="5" + follows="all" + left="10"> + </panel> +</floater> 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 4516c01670..350c385cc3 100644 --- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml @@ -82,7 +82,7 @@ text_color="EmphasisColor" height="14" top_pad="-19" - left_pad="-20" + left_pad="-30" length="1" halign="center" name="working_lbl" @@ -92,6 +92,19 @@ width="150"> Refreshing... </text> + <button + follows="right|top" + height="23" + label="Big Preview" + left="200" + top_pad="-19" + name="big_preview_btn" + tool_tip="Click to open big preview" + visible="true" + width="100" > + <button.commit_callback + function="SocialSharing.BigPreview" /> + </button> <text length="1" follows="top|left|right" @@ -99,7 +112,7 @@ height="16" left="9" name="title_label" - top_pad="20" + top_pad="15" type="string"> Title: </text> |