Skip to content
Snippets Groups Projects
Commit 6dbef5f2 authored by Erica Olsen's avatar Erica Olsen
Browse files

Standardized layouts, changed commitment model labels to ok/cancel, modernized advanced floaters.

parent a1ed9ccf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 185 additions and 199 deletions
indra/newview/skins/default/xui/en/floater_color_picker.xml
+ 14
− 17
View file @ 6dbef5f2
...@@ -166,40 +166,37 @@ ...@@ -166,40 +166,37 @@
<check_box <check_box
follows="left|bottom" follows="left|bottom"
height="20" height="20"
label="Apply Immediately" label="Apply Now"
layout="topleft" layout="topleft"
left="12" left="12"
name="apply_immediate" name="apply_immediate"
top="353" top_pad="185"
width="100" /> width="100" />
<button <button
follows="left|top" follows="left|top"
height="32" height="32"
layout="topleft" layout="topleft"
left_delta="130" left_pad="30"
name="color_pipette" name="color_pipette"
picture_style="true" picture_style="true"
top="341"
width="32" /> width="32" />
<button <button
follows="right|bottom" follows="right|bottom"
height="20" height="20"
label="Cancel" label="Ok"
label_selected="Cancel" label_selected="Select"
layout="topleft" layout="topleft"
left_delta="75" left_pad="50"
name="cancel_btn" name="select_btn"
top="353"
width="100" /> width="100" />
<button <button
follows="right|bottom" follows="right|bottom"
height="20" height="20"
label="Select" label="Cancel"
label_selected="Select" label_selected="Cancel"
layout="topleft" layout="topleft"
left_pad="4" left_pad="5"
name="select_btn" name="cancel_btn"
top_delta="0"
width="100" /> width="100" />
<text <text
type="string" type="string"
...@@ -219,10 +216,10 @@ ...@@ -219,10 +216,10 @@
follows="left|top" follows="left|top"
height="16" height="16"
layout="topleft" layout="topleft"
left_delta="0" left="12"
name="(Drag below to save.)" name="(Drag below to save.)"
top_pad="66" top_pad="66"
width="110"> width="130">
(Drag below to save.) (Drag below to save)
</text> </text>
</floater> </floater>
indra/newview/skins/default/xui/en/floater_god_tools.xml
+ 84
− 88
View file @ 6dbef5f2
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
layout="topleft" layout="topleft"
left="10" left="10"
name="Kick all users" name="Kick all users"
top="8" top="30"
width="100"> width="120">
<button.commit_callback <button.commit_callback
function="GridTools.KickAll" /> function="GridTools.KickAll" />
</button> </button>
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
label="Flush This Region&apos;s Map Visibility Caches" label="Flush This Region&apos;s Map Visibility Caches"
label_selected="Flush This Region&apos;s Map Visibility Caches" label_selected="Flush This Region&apos;s Map Visibility Caches"
layout="topleft" layout="topleft"
left_delta="0" left="10"
name="Flush This Region&apos;s Map Visibility Caches" name="Flush This Region&apos;s Map Visibility Caches"
top_pad="8" top_pad="30"
width="250"> width="350">
<button.commit_callback <button.commit_callback
function="GridTools.FlushMapVisibilityCaches" /> function="GridTools.FlushMapVisibilityCaches" />
</button> </button>
...@@ -71,21 +71,21 @@ ...@@ -71,21 +71,21 @@
layout="topleft" layout="topleft"
left="10" left="10"
name="Sim Name:" name="Sim Name:"
top="10" top="12"
width="50"> width="80">
Sim Name: Sim Name:
</text> </text>
<line_editor <line_editor
border_style="line" border_style="line"
border_thickness="1" border_thickness="1"
follows="left|top|right" follows="left|top|right"
height="16" height="20"
layout="topleft" layout="topleft"
left_pad="10" left_pad="0"
max_length="63" max_length="63"
name="region name" name="region name"
top_delta="0" top_delta="0"
width="208"> width="250">
<line_editor.commit_callback <line_editor.commit_callback
function="RegionTools.ChangeAnything" /> function="RegionTools.ChangeAnything" />
</line_editor> </line_editor>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
left="10" left="10"
name="check prelude" name="check prelude"
tool_tip="Set this to make the region a prelude." tool_tip="Set this to make the region a prelude."
top="30" top_pad="10"
width="180"> width="180">
<check_box.commit_callback <check_box.commit_callback
function="RegionTools.ChangePrelude" /> function="RegionTools.ChangePrelude" />
...@@ -188,11 +188,11 @@ ...@@ -188,11 +188,11 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Bake Terrain" label="Bake Terrain"
label_selected="Bake Terrain" label_selected="Bake Terrain"
layout="topleft" layout="topleft"
left_delta="-2" left="12"
name="Bake Terrain" name="Bake Terrain"
tool_tip="Save the current terrain as default." tool_tip="Save the current terrain as default."
top_pad="32" top_pad="32"
...@@ -203,14 +203,13 @@ ...@@ -203,14 +203,13 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Revert Terrain" label="Revert Terrain"
label_selected="Revert Terrain" label_selected="Revert Terrain"
layout="topleft" layout="topleft"
left_delta="0"
name="Revert Terrain" name="Revert Terrain"
tool_tip="Replace the current terrain with default." tool_tip="Replace the current terrain with default."
top_pad="4" top_pad="10"
width="110"> width="110">
<button.commit_callback <button.commit_callback
function="RegionTools.RevertTerrain" /> function="RegionTools.RevertTerrain" />
...@@ -218,14 +217,13 @@ ...@@ -218,14 +217,13 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Swap Terrain" label="Swap Terrain"
label_selected="Swap Terrain" label_selected="Swap Terrain"
layout="topleft" layout="topleft"
left_delta="0"
name="Swap Terrain" name="Swap Terrain"
tool_tip="Swap current terrain with default." tool_tip="Swap current terrain with default."
top_pad="4" top_pad="10"
width="110"> width="110">
<button.commit_callback <button.commit_callback
function="RegionTools.SwapTerrain" /> function="RegionTools.SwapTerrain" />
...@@ -239,7 +237,7 @@ ...@@ -239,7 +237,7 @@
layout="topleft" layout="topleft"
left="200" left="200"
name="estate id" name="estate id"
top="30" top="40"
width="190"> width="190">
Estate ID: Estate ID:
</text> </text>
...@@ -263,7 +261,7 @@ ...@@ -263,7 +261,7 @@
layout="topleft" layout="topleft"
left="200" left="200"
name="parent id" name="parent id"
top="50" top_pad="4"
width="190"> width="190">
Parent ID: Parent ID:
</text> </text>
...@@ -290,7 +288,7 @@ ...@@ -290,7 +288,7 @@
layout="topleft" layout="topleft"
left="200" left="200"
name="Grid Pos: " name="Grid Pos: "
top="70" top_pad="4"
width="190"> width="190">
Grid Pos: Grid Pos:
</text> </text>
...@@ -332,8 +330,8 @@ ...@@ -332,8 +330,8 @@
layout="topleft" layout="topleft"
left="200" left="200"
name="Redirect to Grid: " name="Redirect to Grid: "
top="90" top_pad="4"
width="190"> width="88">
Redirect to Grid: Redirect to Grid:
</text> </text>
<line_editor <line_editor
...@@ -342,10 +340,9 @@ ...@@ -342,10 +340,9 @@
follows="top|right" follows="top|right"
height="16" height="16"
layout="topleft" layout="topleft"
left_delta="88" left_pad="0"
max_length="10" max_length="10"
name="redirectx" name="redirectx"
top_delta="0"
width="50"> width="50">
<line_editor.commit_callback <line_editor.commit_callback
function="RegionTools.ChangeAnything" /> function="RegionTools.ChangeAnything" />
...@@ -364,15 +361,27 @@ ...@@ -364,15 +361,27 @@
<line_editor.commit_callback <line_editor.commit_callback
function="RegionTools.ChangeAnything" /> function="RegionTools.ChangeAnything" />
</line_editor> </line_editor>
<spinner <text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left="200"
name="billable factor text"
top_pad="10"
width="110">
Billable Factor:
</text>
<spinner
follows="top|right" follows="top|right"
height="16" height="16"
initial_value="1" initial_value="1"
layout="topleft" layout="topleft"
left="308"
max_val="4" max_val="4"
name="billable factor" name="billable factor"
top="110" left_pad="0"
width="80"> width="80">
<spinner.commit_callback <spinner.commit_callback
function="RegionTools.ChangeAnything" /> function="RegionTools.ChangeAnything" />
...@@ -384,11 +393,11 @@ ...@@ -384,11 +393,11 @@
font="SansSerif" font="SansSerif"
height="16" height="16"
layout="topleft" layout="topleft"
left_delta="-108" left="200"
name="billable factor text" name="land cost text"
top_delta="0" top_pad="10"
width="110"> width="110">
Billable Factor: L$ per m²:
</text> </text>
<spinner <spinner
follows="top|right" follows="top|right"
...@@ -396,38 +405,25 @@ ...@@ -396,38 +405,25 @@
increment="1" increment="1"
initial_value="1" initial_value="1"
layout="topleft" layout="topleft"
left="308" left_pad="0"
max_val="100" max_val="100"
name="land cost" name="land cost"
top="130"
width="80"> width="80">
<spinner.commit_callback <spinner.commit_callback
function="RegionTools.ChangeAnything" /> function="RegionTools.ChangeAnything" />
</spinner> </spinner>
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-108"
name="land cost text"
top_delta="0"
width="110">
L$ per m²:
</text>
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Refresh" label="Refresh"
label_selected="Refresh" label_selected="Refresh"
layout="topleft" layout="topleft"
left="278" left="278"
name="Refresh" name="Refresh"
tool_tip="Click here to refresh the above information." tool_tip="Click here to refresh the above information."
top="150" top_pad="10"
width="110"> width="110">
<button.commit_callback <button.commit_callback
function="RegionTools.Refresh" /> function="RegionTools.Refresh" />
...@@ -435,14 +431,14 @@ ...@@ -435,14 +431,14 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Apply" label="Apply"
label_selected="Apply" label_selected="Apply"
layout="topleft" layout="topleft"
left_delta="0" left="278"
name="Apply" name="Apply"
tool_tip="Click here to apply any changes from above." tool_tip="Click here to apply any changes from above."
top_pad="36" top="317"
width="110"> width="110">
<button.commit_callback <button.commit_callback
function="RegionTools.ApplyChanges" /> function="RegionTools.ApplyChanges" />
...@@ -450,11 +446,11 @@ ...@@ -450,11 +446,11 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Select Region" label="Select Region"
label_selected="Select Region" label_selected="Select Region"
layout="topleft" layout="topleft"
left="128" left="130"
name="Select Region" name="Select Region"
tool_tip="Select the whole region with the land tool." tool_tip="Select the whole region with the land tool."
top="238" top="238"
...@@ -465,14 +461,14 @@ ...@@ -465,14 +461,14 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Autosave now" label="Autosave now"
label_selected="Autosave now" label_selected="Autosave now"
layout="topleft" layout="topleft"
left_delta="0" left_delta="0"
name="Autosave now" name="Autosave now"
tool_tip="Save gzipped state to autosave directory." tool_tip="Save gzipped state to autosave directory."
top_pad="4" top_pad="10"
width="110"> width="110">
<button.commit_callback <button.commit_callback
function="RegionTools.SaveState" /> function="RegionTools.SaveState" />
...@@ -502,7 +498,7 @@ ...@@ -502,7 +498,7 @@
left="10" left="10"
name="Sim Name:" name="Sim Name:"
top="10" top="10"
width="50"> width="80">
Sim Name: Sim Name:
</text> </text>
<text <text
...@@ -556,7 +552,7 @@ ...@@ -556,7 +552,7 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Apply" label="Apply"
label_selected="Apply" label_selected="Apply"
layout="topleft" layout="topleft"
...@@ -567,11 +563,11 @@ ...@@ -567,11 +563,11 @@
width="110"> width="110">
<button.commit_callback <button.commit_callback
function="ObjectTools.ApplyChanges" /> function="ObjectTools.ApplyChanges" />
</button> </button>
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Set Target" label="Set Target"
label_selected="Set Target" label_selected="Set Target"
layout="topleft" layout="topleft"
...@@ -582,7 +578,7 @@ ...@@ -582,7 +578,7 @@
width="110"> width="110">
<button.commit_callback <button.commit_callback
function="ObjectTools.Set" /> function="ObjectTools.Set" />
</button> </button>
<text <text
type="string" type="string"
length="1" length="1"
...@@ -598,7 +594,7 @@ ...@@ -598,7 +594,7 @@
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Delete Target&apos;s Scripted Objects On Others Land" label="Delete Target&apos;s Scripted Objects On Others Land"
label_selected="Delete Target&apos;s Scripted Objects On Others Land" label_selected="Delete Target&apos;s Scripted Objects On Others Land"
layout="topleft" layout="topleft"
...@@ -609,11 +605,11 @@ ...@@ -609,11 +605,11 @@
width="380"> width="380">
<button.commit_callback <button.commit_callback
function="ObjectTools.DeletePublicOwnedBy" /> function="ObjectTools.DeletePublicOwnedBy" />
</button> </button>
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Delete Target&apos;s Scripted Objects On *Any* Land" label="Delete Target&apos;s Scripted Objects On *Any* Land"
label_selected="Delete Target&apos;s Scripted Objects On *Any* Land" label_selected="Delete Target&apos;s Scripted Objects On *Any* Land"
layout="topleft" layout="topleft"
...@@ -624,11 +620,11 @@ ...@@ -624,11 +620,11 @@
width="380"> width="380">
<button.commit_callback <button.commit_callback
function="ObjectTools.DeleteAllScriptedOwnedBy" /> function="ObjectTools.DeleteAllScriptedOwnedBy" />
</button> </button>
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
height="20" height="22"
label="Delete *ALL* Of Target&apos;s Objects" label="Delete *ALL* Of Target&apos;s Objects"
label_selected="Delete *ALL* Of Target&apos;s Objects" label_selected="Delete *ALL* Of Target&apos;s Objects"
layout="topleft" layout="topleft"
...@@ -639,7 +635,7 @@ ...@@ -639,7 +635,7 @@
width="380"> width="380">
<button.commit_callback <button.commit_callback
function="ObjectTools.DeleteAllOwnedBy" /> function="ObjectTools.DeleteAllOwnedBy" />
</button> </button>
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
...@@ -647,14 +643,14 @@ ...@@ -647,14 +643,14 @@
label="Get Top Colliders" label="Get Top Colliders"
label_selected="Get Top Colliders" label_selected="Get Top Colliders"
layout="topleft" layout="topleft"
left_delta="0" left="12"
name="Get Top Colliders" name="Get Top Colliders"
tool_tip="Gets list of objects experiencing the most narrowphase callbacks." tool_tip="Gets list of objects experiencing the most narrowphase callbacks."
top_pad="28" top_pad="20"
width="110"> width="130">
<button.commit_callback <button.commit_callback
function="ObjectTools.GetTopColliders" /> function="ObjectTools.GetTopColliders" />
</button> </button>
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
...@@ -665,11 +661,11 @@ ...@@ -665,11 +661,11 @@
left_delta="0" left_delta="0"
name="Get Top Scripts" name="Get Top Scripts"
tool_tip="Gets list of objects spending the most time running scripts." tool_tip="Gets list of objects spending the most time running scripts."
top_pad="4" top_pad="5"
width="110"> width="130">
<button.commit_callback <button.commit_callback
function="ObjectTools.GetTopScripts" /> function="ObjectTools.GetTopScripts" />
</button> </button>
<button <button
follows="top|right" follows="top|right"
font="SansSerifSmall" font="SansSerifSmall"
...@@ -680,11 +676,11 @@ ...@@ -680,11 +676,11 @@
left_delta="0" left_delta="0"
name="Scripts digest" name="Scripts digest"
tool_tip="Gets a list of all scripts and number of occurences of each." tool_tip="Gets a list of all scripts and number of occurences of each."
top_pad="4" top_pad="5"
width="110" > width="130" >
<button.commit_callback <button.commit_callback
function="ObjectTools.GetScriptDigest" /> function="ObjectTools.GetScriptDigest" />
</button> </button>
</panel> </panel>
<panel <panel
border="true" border="true"
...@@ -700,16 +696,16 @@ ...@@ -700,16 +696,16 @@
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
height="10" height="22"
layout="topleft" layout="topleft"
left="10" left="10"
name="Destination:" name="Destination:"
top="4" top="12"
width="80"> width="80">
Destination: Destination:
</text> </text>
<combo_box <combo_box
height="16" height="22"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="destination" name="destination"
...@@ -728,17 +724,17 @@ ...@@ -728,17 +724,17 @@
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
height="10" height="22"
layout="topleft" layout="topleft"
left="10" left="10"
name="Request:" name="Request:"
top="28" top_pad="10"
width="80"> width="80">
Request: Request:
</text> </text>
<combo_box <combo_box
allow_text_entry="true" allow_text_entry="true"
height="16" height="22"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="request" name="request"
...@@ -769,7 +765,7 @@ ...@@ -769,7 +765,7 @@
layout="topleft" layout="topleft"
left="10" left="10"
name="Parameter:" name="Parameter:"
top="52" top_pad="10"
width="80"> width="80">
Parameter: Parameter:
</text> </text>
...@@ -777,7 +773,7 @@ ...@@ -777,7 +773,7 @@
border_style="line" border_style="line"
border_thickness="1" border_thickness="1"
follows="left|top" follows="left|top"
height="16" height="22"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
max_length="63" max_length="63"
...@@ -792,8 +788,8 @@ ...@@ -792,8 +788,8 @@
layout="topleft" layout="topleft"
left="10" left="10"
name="Make Request" name="Make Request"
top="96" top_pad="10"
width="100"> width="140">
<button.commit_callback <button.commit_callback
function="GodTools.Request" /> function="GodTools.Request" />
</button> </button>
......
indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+ 15
− 16
View file @ 6dbef5f2
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
layout="topleft" layout="topleft"
left="10" left="10"
name="Filtering:" name="Filtering:"
top="30" top="20"
width="128"> width="128">
Filtering: Filtering:
</text> </text>
...@@ -34,20 +34,20 @@ ...@@ -34,20 +34,20 @@
layout="topleft" layout="topleft"
left="10" left="10"
name="Antialiasing:" name="Antialiasing:"
top="49" top_pad="7"
width="128"> width="128">
Antialiasing: Antialiasing:
</text> </text>
<combo_box <combo_box
control_name="RenderFSAASamples" control_name="RenderFSAASamples"
height="16" height="22"
initial_value="false" initial_value="false"
label="Antialiasing" label="Antialiasing"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="fsaa" name="fsaa"
top_delta="0" top_delta="0"
width="64"> width="130">
<combo_box.item <combo_box.item
label="Disabled" label="Disabled"
name="FSAADisabled" name="FSAADisabled"
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
left="10" left="10"
max_val="2" max_val="2"
name="gamma" name="gamma"
top="70" top_pad="7"
width="202" /> width="202" />
<text <text
type="string" type="string"
...@@ -94,17 +94,17 @@ ...@@ -94,17 +94,17 @@
name="(brightness, lower is brighter)" name="(brightness, lower is brighter)"
top_delta="2" top_delta="2"
width="315"> width="315">
(brightness, lower is brighter, 0=use default) (brightness, lower = brighter, 0 = default)
</text> </text>
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
height="12" height="16"
layout="topleft" layout="topleft"
left="10" left="10"
name="Enable VBO:" name="Enable VBO:"
top="92" top_pad="10"
width="128"> width="128">
Enable VBO: Enable VBO:
</text> </text>
...@@ -117,13 +117,12 @@ ...@@ -117,13 +117,12 @@
left_pad="10" left_pad="10"
name="vbo" name="vbo"
tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled." tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
top_delta="1"
width="315" /> width="315" />
<slider <slider
control_name="TextureMemory" control_name="TextureMemory"
decimal_digits="0" decimal_digits="0"
follows="left|top" follows="left|top"
height="16" height="20"
increment="16" increment="16"
initial_value="32" initial_value="32"
label="Texture Memory (MB):" label="Texture Memory (MB):"
...@@ -133,13 +132,13 @@ ...@@ -133,13 +132,13 @@
max_val="4096" max_val="4096"
name="GrapicsCardTextureMemory" name="GrapicsCardTextureMemory"
tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
top="114" top_pad="10"
width="300" /> width="300" />
<spinner <spinner
control_name="RenderFogRatio" control_name="RenderFogRatio"
decimal_digits="1" decimal_digits="1"
follows="left|top" follows="left|top"
height="16" height="22"
initial_value="4" initial_value="4"
label="Fog Distance Ratio:" label="Fog Distance Ratio:"
label_width="138" label_width="138"
...@@ -148,16 +147,16 @@ ...@@ -148,16 +147,16 @@
max_val="10" max_val="10"
min_val="0.5" min_val="0.5"
name="fog" name="fog"
top_pad="8" top_pad="7"
width="202" /> width="202" />
<button <button
follows="right|bottom" follows="right|bottom"
height="20" height="22"
label="OK" label="OK"
label_selected="OK" label_selected="OK"
layout="topleft" layout="topleft"
left="-110" left="-102"
name="OK" name="OK"
top="194" top="192"
width="90" /> width="90" />
</floater> </floater>
indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+ 12
− 13
View file @ 6dbef5f2
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</floater.string> </floater.string>
<floater.string <floater.string
name="not_allowed"> name="not_allowed">
You are not allowed to view this note. You do not have permission to view this note.
</floater.string> </floater.string>
<floater.string <floater.string
name="Title"> name="Title">
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
height="16" height="16"
image_name="icon_lock.tga" image_name="icon_lock.tga"
layout="topleft" layout="topleft"
left="344" left="340"
mouse_opaque="true" mouse_opaque="true"
name="lock" name="lock"
top="3" top="1"
width="16" /> width="16" />
<text <text
type="string" type="string"
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
font="SansSerif" font="SansSerif"
height="19" height="19"
layout="topleft" layout="topleft"
left="13" left="10"
name="desc txt" name="desc txt"
top="19" top="22"
width="80"> width="90">
Description: Description:
</text> </text>
<line_editor <line_editor
...@@ -55,13 +55,12 @@ ...@@ -55,13 +55,12 @@
border_thickness="1" border_thickness="1"
follows="left|top|right" follows="left|top|right"
font="SansSerif" font="SansSerif"
height="19" height="22"
layout="topleft" layout="topleft"
left_delta="80" left_pad="0"
max_length="127" max_length="127"
name="desc" name="desc"
top_delta="0" width="296" />
width="294" />
<text_editor <text_editor
type="string" type="string"
length="1" length="1"
...@@ -74,7 +73,7 @@ ...@@ -74,7 +73,7 @@
left="4" left="4"
max_length="65536" max_length="65536"
name="Notecard Editor" name="Notecard Editor"
handle_edit_keys_directly="true" handle_edit_keys_directly="true"
tab_group="1" tab_group="1"
top="46" top="46"
width="392" width="392"
...@@ -83,11 +82,11 @@ ...@@ -83,11 +82,11 @@
</text_editor> </text_editor>
<button <button
follows="left|bottom" follows="left|bottom"
height="20" height="22"
label="Save" label="Save"
label_selected="Discard" label_selected="Discard"
layout="topleft" layout="topleft"
left="9" left="288"
name="Save" name="Save"
top="332" top="332"
width="100" /> width="100" />
......
indra/newview/skins/default/xui/en/floater_preview_sound.xml
+ 28
− 29
View file @ 6dbef5f2
...@@ -9,18 +9,6 @@ ...@@ -9,18 +9,6 @@
name="Title"> name="Title">
Sound: [NAME] Sound: [NAME]
</floater.string> </floater.string>
<line_editor
border_style="line"
border_thickness="1"
follows="left|top|right"
font="SansSerif"
height="19"
layout="topleft"
left="85"
max_length="127"
name="desc"
top="19"
width="127" />
<text <text
type="string" type="string"
length="1" length="1"
...@@ -29,34 +17,45 @@ ...@@ -29,34 +17,45 @@
height="19" height="19"
layout="topleft" layout="topleft"
left="10" left="10"
top="22"
name="desc txt" name="desc txt"
top_delta="0" width="90">
width="80">
Description: Description:
</text> </text>
<button <line_editor
follows="left|top" border_style="line"
border_thickness="1"
follows="left|top|right"
font="SansSerif"
height="19" height="19"
font="SansSerifSmall"
label="Play Locally"
label_selected="Play Locally"
layout="topleft" layout="topleft"
left="145" left_pad="0"
name="Sound audition btn" max_length="127"
sound_flags="0" name="desc"
tool_tip="Play this sound so that only you can hear it." width="170" />
top="51"
width="120" />
<button <button
follows="left|top" follows="left|top"
height="19" height="22"
label="Play in World" label="Play in World"
label_selected="Play in World" label_selected="Play in World"
layout="topleft" layout="topleft"
left_delta="-126"
name="Sound play btn" name="Sound play btn"
sound_flags="0" sound_flags="0"
top="55"
left="10"
tool_tip="Play this sound so that others can hear it." tool_tip="Play this sound so that others can hear it."
top_delta="0" width="125" />
width="120" /> <button
follows="left|top"
height="22"
font="SansSerifSmall"
label="Play Locally"
label_selected="Play Locally"
layout="topleft"
name="Sound audition btn"
sound_flags="0"
tool_tip="Play this sound so that only you can hear it."
left_pad="10"
width="125" />
</floater> </floater>
indra/newview/skins/default/xui/en/floater_preview_texture.xml
+ 12
− 15
View file @ 6dbef5f2
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
font="SansSerif" font="SansSerif"
height="19" height="19"
layout="topleft" layout="topleft"
left="13" left="10"
name="desc txt" name="desc txt"
top="21" top="21"
width="80"> width="90">
Description: Description:
</text> </text>
<line_editor <line_editor
...@@ -37,26 +37,23 @@ ...@@ -37,26 +37,23 @@
font="SansSerif" font="SansSerif"
height="19" height="19"
layout="topleft" layout="topleft"
left_delta="80" left_pad="0"
max_length="127" max_length="127"
name="desc" name="desc"
top_delta="-2" width="190" />
width="194" />
<button <button
follows="left|bottom" follows="left|bottom"
height="20" height="22"
label="Discard" label="Delete"
label_selected="Discard"
layout="topleft" layout="topleft"
left="9" left="80"
name="Discard" name="Discard"
top="302" top="302"
width="100" /> width="100" />
<button <button
follows="left|bottom" follows="left|bottom"
height="20" height="22"
label="Keep" label="Save"
label_selected="Keep"
layout="topleft" layout="topleft"
left_pad="5" left_pad="5"
name="Keep" name="Keep"
...@@ -66,12 +63,12 @@ ...@@ -66,12 +63,12 @@
type="string" type="string"
length="1" length="1"
follows="left|bottom" follows="left|bottom"
height="14" height="16"
layout="topleft" layout="topleft"
left="13" left="13"
name="dimensions" name="dimensions"
top="287" top="287"
width="163"> width="303">
Dimensions: [WIDTH] x [HEIGHT] [WIDTH]px x [HEIGHT]px
</text> </text>
</floater> </floater>
indra/newview/skins/default/xui/en/floater_settings_debug.xml
+ 6
− 6
View file @ 6dbef5f2
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<combo_box <combo_box
allow_text_entry="true" allow_text_entry="true"
follows="top|left" follows="top|left"
height="20" height="22"
layout="topleft" layout="topleft"
left="15" left="15"
max_chars="255" max_chars="255"
name="settings_combo" name="settings_combo"
top="30" top="30"
width="200"> width="320">
<combo_box.commit_callback <combo_box.commit_callback
function="SettingSelect" /> function="SettingSelect" />
</combo_box> </combo_box>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
layout="topleft" layout="topleft"
left_delta="0" left_delta="0"
name="comment_text" name="comment_text"
top_pad="15" top_pad="10"
width="320" width="320"
word_wrap="true" /> word_wrap="true" />
<combo_box <combo_box
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
bottom="185" bottom="185"
can_apply_immediately="true" can_apply_immediately="true"
height="55" height="55"
name="val_color_swatch" name="val_color_swatch"
label="Color" label="Color"
layout="topleft" layout="topleft"
width="37" > width="37" >
...@@ -124,12 +124,12 @@ ...@@ -124,12 +124,12 @@
function="CommitSettings" /> function="CommitSettings" />
</spinner> </spinner>
<button <button
height="20" height="22"
label="Reset to default" label="Reset to default"
layout="topleft" layout="topleft"
left="15" left="15"
name="default_btn" name="default_btn"
top="190" top="186"
width="150" > width="150" >
<button.commit_callback <button.commit_callback
function="ClickDefault" /> function="ClickDefault" />
......
indra/newview/skins/default/xui/en/floater_sound_preview.xml
+ 14
− 15
View file @ 6dbef5f2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
left_delta="0" left_delta="0"
max_length="63" max_length="63"
name="name_form" name="name_form"
top_pad="4" top_pad="0"
width="280" /> width="280" />
<text <text
type="string" type="string"
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
left_delta="0" left_delta="0"
mouse_opaque="false" mouse_opaque="false"
name="description_label" name="description_label"
top_pad="4" top_pad="10"
width="270"> width="270">
Description: Description:
</text> </text>
...@@ -51,25 +51,24 @@ ...@@ -51,25 +51,24 @@
left_delta="0" left_delta="0"
max_length="127" max_length="127"
name="description_form" name="description_form"
top_pad="4" top_pad="0"
width="280" /> width="280" />
<button
follows="left|bottom"
height="22"
label="Upload (L$[AMOUNT])"
layout="topleft"
left="45"
name="ok_btn"
top_pad="60"
width="150" />
<button <button
follows="right|bottom" follows="right|bottom"
height="20" height="22"
label="Cancel" label="Cancel"
label_selected="Cancel" label_selected="Cancel"
layout="topleft" layout="topleft"
left="200"
name="cancel_btn" name="cancel_btn"
top="160" left_pad="5"
width="90" /> width="90" />
<button
follows="left|bottom"
height="20"
label="Upload (L$[AMOUNT])"
layout="topleft"
left_delta="-135"
name="ok_btn"
top_delta="0"
width="130" />
</floater> </floater>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment