Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snapshot floater changes

Browse Source 
* Added a radio button for "Post to my.secondlife.com feed"
* Moved the snapshot to the top of the floater.
* Increased the size of the snapshot to match the size used in V3
  (floater is only 4 pixels wider though).
* Disable the "Temporary upload" checkbox when the Destination isn't the
  inventory.
* Update the shown Upload Fee to L$ 0 if temporary is checked.
* Added a size chooser for the Feed destination, using exclusively
  preset sizes with an aspect ratio of 4:3.
* Added two new preset sizes: 1024x1024 for texture uploads, and
  1680x1050 for save to disk.
This commit is contained in:
Aleric Inglewood
2012-11-20 22:20:12 +01:00
parent 5947769812
commit 14c046108e
3 changed files with 151 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
indra/newview/skins/default/xui/en-us/floater_snapshot.xml
View File

@@ -1,32 +1,35 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
can_resize="false" follows="left|top" height="566" name="Snapshot"
rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
<text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
width="195">
Snapshot destination
</text>
<radio_group bottom_delta="-65" follows="left|top" height="60" label="Snapshot type"
left="10" name="snapshot_type_radio" width="195">
<radio_item bottom="-19" height="16" name="postcard">
rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="219">
<text bottom="-177" right="-6" height="25" name="file_size_label" halign="right" width="120">
File size: [SIZE] KB
</text>
<text bottom="-171" height="15" left="10" name="type_label" halign="left">
Destination
</text>
<radio_group bottom_delta="-79" follows="left|top" height="79" label="Snapshot type"
left="10" name="snapshot_type_radio" width="200">
<radio_item bottom="-19" height="16" name="feed">
Post to my.secondlife.com feed
</radio_item>
<radio_item bottom="-38" height="16" name="postcard">
Send via email
</radio_item>
<radio_item bottom="-38" height="16" name="texture">
<radio_item bottom="-57" height="16" name="texture">
Save to your inventory ([UPLOADFEE])
</radio_item>
<radio_item bottom="-57" height="16" name="local">
<radio_item bottom="-76" height="16" name="local">
Save to your hard drive
</radio_item>
</radio_group>
<text bottom="-236" follows="left|top" height="25" left="10" name="file_size_label"
width="195">
File size: [SIZE] KB
</text>
<button bottom="-246" follows="left|top" height="20" label="Refresh Snapshot" left="10"
<button bottom_delta="-28" follows="left|top" height="20" label="Refresh Snapshot" left="10"
name="new_snapshot_btn" width="195" />
<button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
<button bottom_delta="-22" follows="left|top" height="20" label="Upload" left="10"
name="feed_btn" width="105" />
<button bottom_delta="0" follows="left|top" height="20" label="Send" left="10"
name="send_btn" width="105" />
<button bottom_delta="0" follows="left|top" height="20" label="Save ([UPLOADFEE])" left="10"
<button bottom_delta="0" follows="left|top" height="20" label="Upload ([UPLOADFEE])" left="10"
name="upload_btn" width="105" />
<flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
@@ -36,7 +39,7 @@
</flyout_button>
<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
name="discard_btn" width="85" />
<button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
<button bottom_delta="-26" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="More &gt;&gt;" left="10"
mouse_opaque="true" name="more_btn" scale_image="TRUE"
tool_tip="Advanced Options" width="80" />
@@ -53,6 +56,30 @@
Format
</text>
<combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
name="feed_size_combo" width="125">
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
</combo_item>
<combo_item name="640x480" value="[i640,i480]">
640x480
</combo_item>
<combo_item name="700x525" value="[i700,i525]">
700x525 (prefered)
</combo_item>
<combo_item name="800x600" value="[i800,i600]">
800x600 (resized)
</combo_item>
<combo_item name="1024x768" value="[i1024,i768]">
1024x768 (resized)
</combo_item>
<combo_item name="1280x1024" value="[i1280,i1024]">
1280x1024 (resized)
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
name="postcard_size_combo" width="115">
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
@@ -71,7 +98,7 @@
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
name="texture_size_combo" width="115">
name="texture_size_combo" width="150">
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
</combo_item>
@@ -84,6 +111,9 @@
<combo_item name="Large(512x512)" value="[i512,i512]">
Large (512x512)
</combo_item>
<combo_item name="Humongous (1024x1024)" value="[i1024,i1024]">
Humongous (1024x1024)
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom
</combo_item>
@@ -111,6 +141,9 @@
<combo_item name="1600x1200" value="[i1600,i1200]">
1600x1200
</combo_item>
<combo_item name="1680x1050" value="[i1680,i1050]">
1680x1050
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom
</combo_item>