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

All places just av/group names were being used are now name ui

Browse Source 
Since NameBoxes are clickable, remove redundant profile buttons.
Removes a ton of RLV logic, now centralized inside LLNameUI
Removes excess functions that went largely unused

May no longer show if parcel sale is pending under the owner field,
this is weird and it's hard to keep this behavior

Also includes the missing setValue and getValue so this compiles,
that should've been committed way earlier, oops

Also adds ability for name_box to have is_group attribute, too!
This commit is contained in:
Liru Færs
2019-10-09 23:57:01 -04:00
parent d54bf78c08
commit d277f1750d
31 changed files with 151 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -63,32 +63,25 @@
mouse_opaque="true" name="Owner:" v_pad="0" width="92">
Owner:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
mouse_opaque="true" name="OwnerText" v_pad="0">
Leyla Linden
</text>
<button bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
halign="center" height="16" label="Profile..." label_selected="Profile..."
left="350" mouse_opaque="true" name="Profile..." scale_image="true"
width="90" />
</name_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="Group:" v_pad="0" width="92">
Group:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
mouse_opaque="true" name="GroupText" v_pad="0" width="250" />
mouse_opaque="true" name="GroupText" v_pad="0" width="250" is_group="true"/>
<button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
halign="center" height="16" label="Set..." label_selected="Set..."
left="350" mouse_opaque="true" name="Set..." scale_image="true" width="50" />
<button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
halign="center" height="16" label="Info"
left="400" mouse_opaque="true" name="group_profile" scale_image="true" width="50" />
left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />
<check_box bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Allow Deed to Group" left="96"
mouse_opaque="true" name="check deed" radio_style="false"
@@ -240,12 +233,6 @@
<string name="group_owned_text">
(Group Owned)
</string>
<string name="profile_text">
Profile...
</string>
<string name="info_text">
Info...
</string>
<string name="public_text">
(public)
</string>
@@ -287,12 +274,12 @@ Go to World menu > About Land or select another parcel to show its details.
mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
Owner:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
mouse_opaque="false" name="estate_owner_text" v_pad="0">
(none)
</text>
</name_box>
<text_editor type="string" length="1" bottom="-175" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerifSmall" height="115"
left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"

4
indra/newview/skins/default/xui/en-us/floater_buy_land.xml
View File

@@ -37,11 +37,11 @@
width="100" word_wrap="true">
Estate Owner:
</text>
<text bottom_delta="0" follows="left|top"
<name_box bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="550" name="estate_owner_text"
width="175">
(unknown)
</text>
</name_box>
<text follows="left|top" font="SansSerif" height="16"
left="440" name="resellable_changeable_label" right="725"
width="260" word_wrap="true">

27
indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
View File

@@ -31,45 +31,36 @@
mouse_opaque="true" name="LabelCreatorTitle" v_pad="0" width="78">
Creator:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="LabelCreatorName" v_pad="0" width="200">
mouse_opaque="true" name="LabelCreatorName" v_pad="0" width="200" rlv_sensitive="true">
Nicole Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="" left_delta="174"
mouse_opaque="true" name="BtnCreator" width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="LabelOwnerTitle" v_pad="0" width="78">
Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="LabelOwnerName" v_pad="0" width="200">
mouse_opaque="true" name="LabelOwnerName" v_pad="0" width="200" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="" left_delta="174"
mouse_opaque="true" name="BtnOwner" width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="LabelLastOwnerTitle" v_pad="0" width="78">
Last Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="LabelLastOwnerName" v_pad="0" width="200">
mouse_opaque="true" name="LabelLastOwnerName" v_pad="0" width="200" rlv_sensitive="true">
OnceUponA Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="" left_delta="174"
mouse_opaque="true" name="BtnLastOwner" width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

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

@@ -450,48 +450,36 @@
mouse_opaque="true" name="Creator:" v_pad="0" width="78">
Creator:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-66" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
mouse_opaque="true" name="Creator Name" v_pad="0" width="88" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="Profile..." left_delta="94"
mouse_opaque="true" name="button creator profile" scale_image="TRUE"
width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-86" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="Owner:" v_pad="0" width="78">
Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-86" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
mouse_opaque="true" name="Owner Name" v_pad="0" width="88" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="Profile..." left_delta="94"
mouse_opaque="true" name="button owner profile" scale_image="TRUE"
width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
Last Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="Profile..." left_delta="94"
mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-126" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
@@ -505,13 +493,10 @@
bottom="-126"
left_delta="78"
name="Group Name Proxy"
width="142"/>
width="142" is_group="true"/>
<button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Set" label_selected="Set..." left_delta="94"
height="16" label="Set" label_selected="Set..." left_delta="142"
mouse_opaque="true" name="button set group" scale_image="TRUE" width="30" />
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="View" label_selected="Open" left_delta="30"
mouse_opaque="true" name="button open group" scale_image="TRUE" width="48" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

13
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -26,7 +26,7 @@
mouse_opaque="true" name="Name:" v_pad="0" width="70">
Name:
</text>
<line_editor bevel_style="in" border_style="line"
<name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom="-48" enabled="false" follows="left|top"
font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
max_length="254" mouse_opaque="false" name="dnname"
@@ -75,14 +75,11 @@
<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
height="18" label="?" label_selected="?" left_delta="24"
mouse_opaque="true" name="partner_help" width="18" />
<line_editor bevel_style="in" border_style="line"
<name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" is_unicode="false" left_delta="-119"
max_length="254" mouse_opaque="false" name="partner_edit"
tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
width="137">
[NAME]
</line_editor>
font="SansSerifSmall" height="16" left_delta="-119"
max_length="1024" mouse_opaque="true" name="partner_edit"
width="137"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-68" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

4
indra/newview/skins/default/xui/en-us/panel_event.xml
View File

@@ -49,10 +49,10 @@
name="event_runby_label">
Run By:
</text>
<text bottom_delta="0" follows="top|left" font="SansSerif" left="120"
<name_box bottom_delta="0" follows="top|left" font="SansSerif" left="120"
name="event_runby">
(none)
</text>
</name_box>
<text bottom_delta="-16" follows="top|left" font="SansSerif" left="20"
name="event_location_label">
Location:

6
indra/newview/skins/default/xui/en-us/panel_group_general.xml
View File

@@ -19,12 +19,12 @@ Hover your mouse over the options for more help.
h_pad="0" halign="left" height="16" label="Type your new group name here"
left="7" max_length="35" mouse_opaque="true" name="group_name_editor"
prevalidate="ascii" v_pad="0" width="300" spell_check="true" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
mouse_opaque="true" name="group_name" v_pad="0" width="300">
mouse_opaque="true" name="group_name" v_pad="0" width="300" is_group="true">
Type your new group name here
</text>
</name_box>
<text font="SansSerifSmall" name="prepend_founded_by">
Founded by
</text>

4
indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
View File

@@ -25,12 +25,12 @@
mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
Owner:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-65" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
mouse_opaque="false" name="estate_owner_text" v_pad="0">
(none)
</text>
</name_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"

4
indra/newview/skins/default/xui/en-us/panel_region_estate.xml
View File

@@ -64,7 +64,7 @@
width="150">
Estate owner:
</text>
<text
<name_box
type="string"
length="1"
follows="left|top"
@@ -77,7 +77,7 @@
use_ellipses="true"
width="290">
(unknown)
</text>
</name_box>
<view_border
bevel_style="none"