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

Update LLFloaterTools to use commit callback registrar where convenient.

Browse Source
This commit is contained in:
Shyotl
2013-06-14 03:55:40 -05:00
parent 9d0f7bacfc
commit 5f4091b4d2
3 changed files with 255 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -11,75 +11,135 @@
image_disabled="tool_zoom.tga" image_disabled_selected="tool_zoom_active.tga"
image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
tool_tip="Focus" width="32" />
tool_tip="Focus" width="32" >
<button.commit_callback
function="BuildTool.setTool"
parameter="Focus" />
</button>
<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
image_disabled="UIImgGrabUUID" image_disabled_selected="UIImgGrabSelectedUUID"
image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
label="" label_selected="" left="40" mouse_opaque="true" name="button move"
tool_tip="Move" width="32" />
tool_tip="Move" width="32" >
<button.commit_callback
function="BuildTool.setTool"
parameter="Move" />
</button>
<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
image_disabled="UIImgFaceUUID" image_disabled_selected="UIImgFaceSelectedUUID"
image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
tool_tip="Edit" width="32" />
tool_tip="Edit" width="32" >
<button.commit_callback
function="BuildTool.setTool"
parameter="Edit" />
</button>
<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
image_disabled="UIImgCreateUUID" image_disabled_selected="UIImgCreateSelectedUUID"
image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
label="" label_selected="" left="112" mouse_opaque="true"
name="button create" tool_tip="Create" width="32" />
name="button create" tool_tip="Create" width="32" >
<button.commit_callback
function="BuildTool.setTool"
parameter="Create" />
</button>
<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
image_disabled="tool_dozer.tga" image_disabled_selected="tool_dozer_active.tga"
image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
label="" label_selected="" left="148" mouse_opaque="true"
name="button land" tool_tip="Land" width="32" />
name="button land" tool_tip="Land" width="32" >
<button.commit_callback
function="BuildTool.setTool"
parameter="Land" />
</button>
<!-- Focus panel -->
<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Zoom" left="4" mouse_opaque="true"
name="radio zoom" radio_style="true" width="114" />
name="radio zoom" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioFocus"/>
</check_box>
<volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
initial_val="0.125" left="114" max_val="0.5" min_val="0"
mouse_opaque="true" name="slider zoom" width="134" />
mouse_opaque="true" name="slider zoom" width="134" >
<volume_slider.commit_callback
function="BuildTool.commitZoom"/>
</volume_slider>
<check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
name="radio orbit" radio_style="true" width="114" />
name="radio orbit" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioFocus"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Pan (Ctrl-Shift)" left="4"
mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
mouse_opaque="true" name="radio pan" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioFocus"/>
</check_box>
<!-- Move panel -->
<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Move" left="4" mouse_opaque="true"
name="radio move" radio_style="true" width="114" />
name="radio move" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioMove"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
name="radio lift" radio_style="true" width="114" />
name="radio lift" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioMove"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Spin (Ctrl-Shift)" left="4"
mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
mouse_opaque="true" name="radio spin" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioMove"/>
</check_box>
<!-- Edit panel -->
<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Position" left="4" mouse_opaque="true"
name="radio position" radio_style="true" width="114" />
name="radio position" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioEdit"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
name="radio rotate" radio_style="true" width="114" />
name="radio rotate" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioEdit"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
mouse_opaque="true" name="radio stretch" radio_style="true" width="123" >
<check_box.commit_callback
function="BuildTool.commitRadioEdit"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
name="radio select face" radio_style="true" width="114" />
name="radio select face" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioEdit"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Align (Ctrl-A)" left="4" mouse_opaque="true"
name="radio align" radio_style="true" width="114" />
name="radio align" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioEdit"/>
</check_box>
<check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Edit linked parts" left="4" mouse_opaque="true"
name="checkbox edit linked parts" width="114" />
name="checkbox edit linked parts" width="114">
<check_box.commit_callback
function="BuildTool.selectComponent"/>
</check_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-17" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
@@ -98,6 +158,8 @@
<combo_item name="Reference" value="Reference">
Reference
</combo_item>
<combo_box.commit_callback
function="BuildTool.gridMode"/>
</combo_box>
<check_box bottom="-67" control_name="ScaleUniform" follows="left|top"
font="SansSerifSmall" height="15" initial_value="false"
@@ -120,7 +182,10 @@
left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
valign="center" height="18" label="Options..." label_selected="Options..."
left_delta="64" mouse_opaque="true" name="Options..." scale_image="TRUE" width="75" />
left_delta="64" mouse_opaque="true" name="Options..." scale_image="TRUE" width="75" >
<button.commit_callback
function="BuildTool.gridOptions"/>
</button>
<!-- Help text -->
@@ -249,29 +314,53 @@
<check_box bottom="-69" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Select Land" left="4" mouse_opaque="true"
name="radio select land" radio_style="true" width="114" />
name="radio select land" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioLand"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Flatten" left="4" mouse_opaque="true"
name="radio flatten" radio_style="true" width="114" />
name="radio flatten" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioLand"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Raise" left="4" mouse_opaque="true"
name="radio raise" radio_style="true" width="114" />
name="radio raise" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioLand"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Lower" left="4" mouse_opaque="true"
name="radio lower" radio_style="true" width="114" />
name="radio lower" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioLand"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Smooth" left="4" mouse_opaque="true"
name="radio smooth" radio_style="true" width="114" />
name="radio smooth" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioLand"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Roughen" left="4" mouse_opaque="true"
name="radio noise" radio_style="true" width="114" />
name="radio noise" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioLand"/>
</check_box>
<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Revert" left="4" mouse_opaque="true"
name="radio revert" radio_style="true" width="114" />
name="radio revert" radio_style="true" width="114" >
<check_box.commit_callback
function="BuildTool.commitRadioLand"/>
</check_box>
<button bottom="-72" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="Apply" label_selected="Apply"
left="116" mouse_opaque="true" name="button apply to selection"
scale_image="TRUE" tool_tip="Modify Selected Land" width="78" />
scale_image="TRUE" tool_tip="Modify Selected Land" width="78" >
<button.commit_callback
function="BuildTool.applyToSelection"/>
</button>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
@@ -286,7 +375,10 @@
</text>
<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
mouse_opaque="true" name="slider brush size" width="80" />
mouse_opaque="true" name="slider brush size" width="80" >
<volume_slider.commit_callback
function="BuildTool.commitDozerSize"/>
</volume_slider>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
@@ -295,7 +387,10 @@
</text>
<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
mouse_opaque="true" name="slider force" width="80" />
mouse_opaque="true" name="slider force" width="80" >
<volume_slider.commit_callback
function="BuildTool.LandBrushForce"/>
</volume_slider>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-160" left="118" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="right" height="16" visible="false"