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

Sync with upstream, improve RLVa and make use of the callback registrar

Browse Source
This commit is contained in:
Lirusaito
2013-07-12 18:43:59 -04:00
parent c77f0de9cf
commit 4da47de90c
11 changed files with 175 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
View File

@@ -72,10 +72,16 @@
<button bottom_delta="-27" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="20" label="Check All" label_selected="All" left="8"
mouse_opaque="true" name="check_all" scale_image="true" width="100" />
mouse_opaque="true" name="check_all" scale_image="true" width="100" >
<button.commit_callback
function="BulkPermission.CheckAll" />
</button>
<button bottom_delta="-24" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="20" label="Uncheck All" label_selected="None" left="8"
mouse_opaque="true" name="check_none" scale_image="true" width="100" />
mouse_opaque="true" name="check_none" scale_image="true" width="100" >
<button.commit_callback
function="BulkPermission.UncheckAll"/>
</button>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -103,7 +109,10 @@
<check_box bottom_delta="0" follows="left|top" width="88" height="16"
left_delta="78" radio_style="false" font="SansSerifSmall"
initial_value="false" label="Copy" mouse_opaque="true"
name="next_owner_copy" control_name="BulkChangeNextOwnerCopy" />
name="next_owner_copy" control_name="BulkChangeNextOwnerCopy" >
<check_box.commit_callback
function="BulkPermission.CommitCopy"/>
</check_box>
<check_box bottom_delta="0" follows="left|top" width="106" height="16"
left_delta="88" radio_style="false" font="SansSerifSmall"
initial_value="true" label="Resell/Give away" mouse_opaque="true" enabled="false"
@@ -117,14 +126,23 @@
<button bottom="10" left="10" width="90" height="20" follows="left|top"
label="Help" name="help" enabled="true"
mouse_opaque="true" font="SansSerif" scale_image="true" halign="center" />
mouse_opaque="true" font="SansSerif" scale_image="true" halign="center" >
<button.commit_callback
function="BulkPermission.Help"/>
</button>
<button bottom="10" left="265" width="100" height="20" follows="left|top"
label="Apply" name="apply" enabled="true"
mouse_opaque="true" font="SansSerif" scale_image="true" halign="center" />
mouse_opaque="true" font="SansSerif" scale_image="true" halign="center" >
<button.commit_callback
function="BulkPermission.Apply"/>
</button>
<button bottom_delta="0" left_delta="105" width="100" height="20" follows="left|top"
label="Close" name="close" enabled="true"
mouse_opaque="true" font="SansSerif" scale_image="true" halign="center" />
mouse_opaque="true" font="SansSerif" scale_image="true" halign="center" >
<button.commit_callback
function="BulkPermission.Close"/>
</button>
<string name="nothing_to_modify_text">Selection contains no editable contents.</string>
<string name="status_text">Setting permissions on [NAME]</string>

8
indra/newview/skins/default/xui/en-us/floater_notifications_console.xml
View File

@@ -3,7 +3,9 @@
can_resize="true" enabled="true" height="500" left="176" title="Notifications Console" min_height="50"
min_width="100" mouse_opaque="true" name="notifications_console" width="500">
<combo_box name="notification_types" left="2" bottom="-40" height="18" width="440" follows="left|right|top" label="Select notification type"/>
<button name="add_notification" left="445" bottom="-40" height="18" width="50" follows="right|top" label="Add"/>
<layout_stack name="notification_channels" left="5" right="-5" top="-42" bottom="5" follows="left|right|top|bottom" orientation="vertical">
</layout_stack>
<button name="add_notification" left="445" bottom="-40" height="18" width="50" follows="right|top" label="Add">
<button.commit_callback
function="ClickAdd" />
</button>
<layout_stack name="notification_channels" left="5" right="-5" top="-42" bottom="5" follows="left|right|top|bottom" orientation="vertical"/>
</floater>

41
indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
View File

@@ -2,8 +2,12 @@
<floater can_close="true" can_drag_on_left="false" can_minimize="false"
can_resize="true" height="220" name="settings_debug" min_height="220" min_width="285"
title="Debug Settings" width="300" rect_control="FloaterDebugSettingsRect">
<filter_editor bottom="-40" follows="top|left|right" height="20" label="Search" left="10" right="-10" max_chars="255" name="search_settings_input" tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."/>
<scroll_list height="20" bottom_delta="-24" follows="all" left="10" right="-10" name="settings_scroll_list" />
<filter_editor bottom="-40" follows="top|left|right" height="20" label="Search" left="10" right="-10" max_chars="255" name="search_settings_input" tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment.">
<filter_editor.commit_callback function="UpdateFilter"/>
</filter_editor>
<scroll_list height="20" bottom_delta="-24" follows="all" left="10" right="-10" name="settings_scroll_list">
<scroll_list.commit_callback function="SettingSelect"/>
</scroll_list>
<text_editor follows="left|right" bottom_delta="-64" enabled="false" height="60" width="320" left="10" right="-10" hide_scrollbar="true"
name="comment_text" word_wrap="true" />
<radio_group bottom_delta="-48" draw_border="false" follows="bottom|left|right" height="36"
@@ -14,20 +18,37 @@
<radio_item bottom="-36" height="15" name="FALSE" value="">
False
</radio_item>
<radio_group.commit_callback function="CommitSettings"/>
</radio_group>
<line_editor follows="bottom|left|right" bottom="52" left="15" right="-15" height="20" name="val_text" visible="false" width="300" />
<line_editor follows="bottom|left|right" bottom="52" left="15" right="-15" height="20" name="val_text" visible="false" width="300">
<line_editor.commit_callback function="CommitSettings"/>
</line_editor>
<color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
name="val_color_swatch" visible="false" width="37" />
name="val_color_swatch" visible="false" width="37">
<color_swatch.commit_callback function="CommitSettings"/>
</color_swatch>
<spinner bottom_delta="31" height="24" label="x" label_width="40" max_val="10000000"
name="val_spinner_1" visible="false" width="120" />
name="val_spinner_1" visible="false" width="120">
<spinner.commit_callback function="CommitSettings"/>
</spinner>
<spinner bottom_delta="0" height="24" label="x" label_width="40" left_delta="135"
max_val="10000000" name="val_spinner_2" visible="false" width="120" />
max_val="10000000" name="val_spinner_2" visible="false" width="120">
<spinner.commit_callback function="CommitSettings"/>
</spinner>
<spinner bottom_delta="-23" height="24" label="x" label_width="40" left="15"
max_val="10000000" name="val_spinner_3" visible="false" width="120" />
max_val="10000000" name="val_spinner_3" visible="false" width="120">
<spinner.commit_callback function="CommitSettings"/>
</spinner>
<spinner bottom_delta="0" height="24" label="x" label_width="40" left_delta="135"
max_val="10000000" name="val_spinner_4" visible="false" width="120" />
max_val="10000000" name="val_spinner_4" visible="false" width="120">
<spinner.commit_callback function="CommitSettings"/>
</spinner>
<button bottom="10" height="20" label="Copy Name" left="10" name="copy_btn" tool_tip="Copy the name of this setting."
width="130" />
width="130">
<button.commit_callback function="ClickCopy"/>
</button>
<button follows="right" bottom_delta="0" height="20" label="Reset to default" right="-10" name="default_btn"
width="130" />
width="130">
<button.commit_callback function="ClickDefault"/>
</button>
</floater>