Skip to content
Snippets Groups Projects
Commit 20392e15 authored by richard's avatar richard
Browse files

merge

parents 61310dc6 b2b8df65
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+ 149
− 113
View file @ 20392e15
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
name="item properties" name="item properties"
help_topic="item_properties" help_topic="item_properties"
save_rect="true" save_rect="true"
title="Inventory Item Properties" title="Object Profile"
width="333"> width="333">
<panel.string <panel.string
name="unknown"> name="unknown">
...@@ -50,15 +50,15 @@ ...@@ -50,15 +50,15 @@
width="23" /> width="23" />
<text <text
follows="top|left|right" follows="top|left|right"
font="SansSerifHugeBold" font="SansSerifHuge"
height="26" height="26"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="title" name="title"
text_color="white" text_color="LtGray"
top="0" top="0"
use_ellipses="true" use_ellipses="true"
value="Item Properties" value="Object Profile"
width="275" /> width="275" />
<panel <panel
follows="all" follows="all"
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
width="313" width="313"
background_visible="true" background_visible="true"
bg_alpha_color="DkGray2"> bg_alpha_color="DkGray2">
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
layout="topleft" layout="topleft"
left="5" left="5"
name="LabelItemNameTitle" name="LabelItemNameTitle"
top="5" top="10"
width="78"> width="78">
Name: Name:
</text> </text>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
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_delta="78" left_delta="78"
max_length="63" max_length="63"
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
layout="topleft" layout="topleft"
left="5" left="5"
name="LabelItemDescTitle" name="LabelItemDescTitle"
top_delta="20" top_pad="10"
width="78"> width="78">
Description: Description:
</text> </text>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
left_delta="78" left_delta="78"
max_length="127" max_length="127"
name="LabelItemDesc" name="LabelItemDesc"
top_delta="0" top_delta="-5"
width="225" /> width="225" />
<text <text
type="string" type="string"
...@@ -123,32 +123,41 @@ ...@@ -123,32 +123,41 @@
follows="left|top" follows="left|top"
height="23" height="23"
layout="topleft" layout="topleft"
left="10" left="5"
name="LabelCreatorTitle" name="LabelCreatorTitle"
top="65" top_pad="10"
width="78"> width="78">
Creator: Creator:
</text> </text>
<avatar_icon
follows="top|left"
height="20"
default_icon_name="Generic_Person"
layout="topleft"
left_pad="0"
top_delta="-6"
mouse_opaque="true"
width="20" />
<text <text
type="string" type="string"
length="1" follows="left|right"
follows="left|top" font="SansSerifSmall"
height="23" height="15"
layout="topleft" layout="topleft"
left_delta="78" left_pad="5"
name="LabelCreatorName" name="LabelCreatorName"
top_delta="0" top_delta="6"
width="140"> width="140">
Nicole Linden Nicole Linden
</text> </text>
<button <button
follows="top|right" follows="top|right"
height="23" height="23"
label="Profile..." label="Profile"
layout="topleft" layout="topleft"
left_delta="144" right="-1"
name="BtnCreator" name="BtnCreator"
top_delta="0" top_delta="-6"
width="78" /> width="78" />
<text <text
type="string" type="string"
...@@ -156,32 +165,41 @@ ...@@ -156,32 +165,41 @@
follows="left|top" follows="left|top"
height="23" height="23"
layout="topleft" layout="topleft"
left="10" left="5"
name="LabelOwnerTitle" name="LabelOwnerTitle"
top="85" top_pad="5"
width="78"> width="78">
Owner: Owner:
</text> </text>
<avatar_icon
follows="top|left"
height="20"
default_icon_name="Generic_Person"
layout="topleft"
left_pad="0"
top_delta="-6"
mouse_opaque="true"
width="20" />
<text <text
type="string" type="string"
length="1" follows="left|right"
follows="left|top" font="SansSerifSmall"
height="23" height="15"
layout="topleft" layout="topleft"
left_delta="78" left_pad="5"
name="LabelOwnerName" name="LabelOwnerName"
top_delta="0" top_delta="6"
width="140"> width="140">
Thrax Linden Thrax Linden
</text> </text>
<button <button
follows="top|right" follows="top|right"
height="23" height="23"
label="Profile..." label="Profile"
layout="topleft" layout="topleft"
left_delta="144" right="-1"
name="BtnOwner" name="BtnOwner"
top_delta="0" top_delta="-3"
width="78" /> width="78" />
<text <text
type="string" type="string"
...@@ -189,9 +207,9 @@ ...@@ -189,9 +207,9 @@
follows="left|top" follows="left|top"
height="23" height="23"
layout="topleft" layout="topleft"
left="10" left="5"
name="LabelAcquiredTitle" name="LabelAcquiredTitle"
top="105" top_pad="10"
width="78"> width="78">
Acquired: Acquired:
</text> </text>
...@@ -207,134 +225,146 @@ ...@@ -207,134 +225,146 @@
width="222"> width="222">
Wed May 24 12:50:46 2006 Wed May 24 12:50:46 2006
</text> </text>
<text <panel
type="string" border="false"
length="1" follows="left|top"
follows="left|top" layout="topleft"
height="23" mouse_opaque="false"
layout="topleft" background_visible="true"
left="10" bg_alpha_color="DkGray"
name="OwnerLabel" name="perms_inv"
top="125" left="0"
width="78"> top_pad="25"
You: height="155"
</text> width="313">
<text
type="string"
length="1"
left="10"
top_pad="13"
text_color="EmphasisColor"
height="15"
follows="left|top|right"
layout="topleft"
name="perm_modify"
width="200">
You can:
</text>
<check_box <check_box
height="23" height="18"
label="Edit" label="Modify"
layout="topleft" layout="topleft"
left_pad="5" left="20"
name="CheckOwnerModify" name="CheckOwnerModify"
top_delta="0" top_pad="0"
width="78" /> width="90" />
<check_box <check_box
height="23" height="18"
label="Copy" label="Copy"
layout="topleft" layout="topleft"
left_delta="0" left_pad="0"
name="CheckOwnerCopy" name="CheckOwnerCopy"
top_pad="5" width="90" />
width="88" />
<check_box <check_box
height="23" height="18"
label="Resell" label="Transfer"
layout="topleft" layout="topleft"
left_delta="0" left_pad="0"
name="CheckOwnerTransfer" name="CheckOwnerTransfer"
top_pad="5"
width="106" /> width="106" />
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
height="10" height="16"
layout="topleft" layout="topleft"
left="10" left="10"
name="AnyoneLabel" name="AnyoneLabel"
top_pad="5" top_pad="8"
width="78"> width="100">
Anyone: Anyone:
</text> </text>
<check_box <check_box
height="16" height="18"
label="Copy" label="Copy"
layout="topleft" layout="topleft"
left_pad="5" left_pad="0"
name="CheckEveryoneCopy" name="CheckEveryoneCopy"
top_delta="0" top_delta="-2"
width="130" /> width="150" />
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
height="10" height="16"
layout="topleft" layout="topleft"
left="10" left="10"
name="GroupLabel" name="GroupLabel"
top_pad="5" top_pad="8"
width="78"> width="100">
Group: Group:
</text> </text>
<check_box <check_box
height="16" height="18"
label="Share" label="Share"
layout="topleft" layout="topleft"
left_pad="5" left_pad="0"
top_delta="-2"
name="CheckShareWithGroup" name="CheckShareWithGroup"
top_delta="5" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
width="106" /> width="150" />
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
height="25" height="16"
layout="topleft" layout="topleft"
left="10" left="10"
name="NextOwnerLabel" name="NextOwnerLabel"
top_pad="5" top_pad="8"
width="78" width="200"
word_wrap="true"> word_wrap="true">
Next owner: Next owner:
</text> </text>
<check_box <check_box
height="16" height="18"
label="Edit" label="Modify"
layout="topleft" layout="topleft"
left_pad="5" left="20"
top_pad="0"
name="CheckNextOwnerModify" name="CheckNextOwnerModify"
top_delta="0" width="90" />
width="78" />
<check_box <check_box
height="16" height="18"
label="Copy" label="Copy"
layout="topleft" layout="topleft"
left_delta="0" left_pad="0"
name="CheckNextOwnerCopy" name="CheckNextOwnerCopy"
top_pad="5" width="90" />
width="88" />
<check_box <check_box
height="16" height="18"
label="Resell" label="Transfer"
layout="topleft" layout="topleft"
left_delta="0" left_pad="0"
name="CheckNextOwnerTransfer" name="CheckNextOwnerTransfer"
top_pad="5" tool_tip="Next owner can give away or resell this object"
width="106" /> width="106" />
</panel>
<check_box <check_box
height="16" height="18"
label="For Sale" label="For Sale"
layout="topleft" layout="topleft"
left="10" left="20"
name="CheckPurchase" name="CheckPurchase"
top_pad="5" top_pad="20"
width="78" /> width="100" />
<combo_box <combo_box
height="19" height="23"
left_pad="5" left_pad="0"
layout="topleft" layout="topleft"
follows="left|top" follows="left|top"
name="combobox sale copy" name="combobox sale copy"
width="110"> width="170">
<combo_box.item <combo_box.item
label="Copy" label="Copy"
name="Copy" name="Copy"
...@@ -350,26 +380,14 @@ ...@@ -350,26 +380,14 @@
increment="1" increment="1"
control_name="Edit Cost" control_name="Edit Cost"
name="Edit Cost" name="Edit Cost"
label="Price:" label="Price: L$"
label_width="100" label_width="75"
left="10" left="120"
width="192" width="170"
min_val="1" min_val="1"
height="19" height="23"
max_val="999999999" max_val="999999999"
top_pad="5"/> top_pad="10"/>
<text
type="string"
length="1"
height="15"
follows="left|top"
layout="topleft"
left_delta="82"
name="CurrencySymbol"
top_delta="1"
width="18">
L$
</text>
<!--line_editor <!--line_editor
border_style="line" border_style="line"
border_thickness="1" border_thickness="1"
...@@ -492,4 +510,22 @@ ...@@ -492,4 +510,22 @@
Price: L$ Price: L$
</text--> </text-->
</panel> </panel>
<panel
height="25"
layout="bottomright"
help_topic="button_tab"
name="button_panel"
left="5"
bottom="5"
width="313">
<button
follows="bottom|right"
height="25"
label="Cancel"
layout="topleft"
name="cancel_btn"
right="-1"
left_pad="10"
width="100" />
</panel>
</panel> </panel>
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