Skip to content
Snippets Groups Projects
Commit 16ae542f authored by Erica's avatar Erica
Browse files

Automated merge with ssh://hg.lindenlab.com/james/gooey

parents 26446530 0af2248e
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
+ 38
− 152
View file @ 16ae542f
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
height="18" height="18"
image_name="Lock" image_name="Lock"
layout="topleft" layout="topleft"
right="-50" right="-15"
mouse_opaque="true" mouse_opaque="true"
name="IconLocked" name="IconLocked"
top="4" top="8"
width="18" /> width="18" />
<button <button
follows="top|right" follows="top|right"
...@@ -60,14 +60,23 @@ ...@@ -60,14 +60,23 @@
use_ellipses="true" use_ellipses="true"
value="Object Profile" value="Object Profile"
width="275" /> width="275" />
<text
follows="top|left"
height="13"
layout="topleft"
left="45"
name="where"
text_color="LtGray_50"
value="(Inventory)"
width="150" />
<panel <panel
follows="all" follows="all"
height="500" height="490"
label="" label=""
layout="topleft" layout="topleft"
left="10" left="10"
help_topic="" help_topic=""
top="30" top="45"
width="313" width="313"
background_visible="true" background_visible="true"
bg_alpha_color="DkGray2"> bg_alpha_color="DkGray2">
...@@ -125,7 +134,7 @@ ...@@ -125,7 +134,7 @@
layout="topleft" layout="topleft"
left="5" left="5"
name="LabelCreatorTitle" name="LabelCreatorTitle"
top_pad="10" top_pad="10"
width="78"> width="78">
Creator: Creator:
</text> </text>
...@@ -135,7 +144,7 @@ top_pad="10" ...@@ -135,7 +144,7 @@ top_pad="10"
default_icon_name="Generic_Person" default_icon_name="Generic_Person"
layout="topleft" layout="topleft"
left_pad="0" left_pad="0"
top_delta="-6" top_delta="-6"
mouse_opaque="true" mouse_opaque="true"
width="20" /> width="20" />
<text <text
...@@ -165,28 +174,28 @@ top_pad="10" ...@@ -165,28 +174,28 @@ top_pad="10"
follows="left|top" follows="left|top"
height="23" height="23"
layout="topleft" layout="topleft"
left="5" left="5"
name="LabelOwnerTitle" name="LabelOwnerTitle"
top_pad="5" top_pad="10"
width="78"> width="78">
Owner: Owner:
</text> </text>
<avatar_icon <avatar_icon
follows="top|left" follows="top|left"
height="20" height="20"
default_icon_name="Generic_Person" default_icon_name="Generic_Person"
layout="topleft" layout="topleft"
left_pad="0" left_pad="0"
top_delta="-6" top_delta="-6"
mouse_opaque="true" mouse_opaque="true"
width="20" /> width="20" />
<text <text
type="string" type="string"
follows="left|right" follows="left|right"
font="SansSerifSmall" font="SansSerifSmall"
height="15" height="15"
layout="topleft" layout="topleft"
left_pad="5" left_pad="5"
name="LabelOwnerName" name="LabelOwnerName"
top_delta="6" top_delta="6"
width="140"> width="140">
...@@ -224,7 +233,7 @@ top_pad="10" ...@@ -224,7 +233,7 @@ top_pad="10"
top_delta="0" top_delta="0"
width="222"> width="222">
Wed May 24 12:50:46 2006 Wed May 24 12:50:46 2006
</text> </text>
<panel <panel
border="false" border="false"
follows="left|top" follows="left|top"
...@@ -350,7 +359,7 @@ top_pad="10" ...@@ -350,7 +359,7 @@ top_pad="10"
tool_tip="Next owner can give away or resell this object" tool_tip="Next owner can give away or resell this object"
width="106" /> width="106" />
</panel> </panel>
<check_box <check_box
height="18" height="18"
label="For Sale" label="For Sale"
layout="topleft" layout="topleft"
...@@ -388,144 +397,21 @@ top_pad="10" ...@@ -388,144 +397,21 @@ top_pad="10"
height="23" height="23"
max_val="999999999" max_val="999999999"
top_pad="10"/> top_pad="10"/>
<!--line_editor </panel>
border_style="line"
border_thickness="1"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="5"
max_length="25"
name="EditPrice"
top_delta="0"
width="242" /-->
<!--text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left="10"
name="BaseMaskDebug"
top="155"
width="330">
B:
</text>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_delta="60"
name="OwnerMaskDebug"
top_delta="0"
width="270">
O:
</text>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_delta="60"
name="GroupMaskDebug"
top_delta="0"
width="210">
G:
</text>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_delta="60"
name="EveryoneMaskDebug"
top_delta="0"
width="150">
E:
</text>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_delta="60"
name="NextMaskDebug"
top_delta="0"
width="90">
N:
</text-->
<!--text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left="10"
name="SaleLabel"
top_pad="5"
width="330">
Mark Item:
</text-->
<!--radio_group
draw_border="false"
follows="left|top|right"
height="16"
layout="topleft"
left_delta="78"
name="RadioSaleType"
top_delta="0"
width="252">
<radio_item
height="16"
label="Original"
layout="topleft"
left="0"
name="radio"
top="0"
width="70" />
<radio_item
height="16"
label="Copy"
layout="topleft"
left_delta="60"
name="radio2"
top_delta="0"
width="70" />
</radio_group-->
<!--text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="10"
name="TextPrice"
top_pad="5"
width="78">
Price: L$
</text-->
</panel>
<panel <panel
height="25" height="30"
layout="bottomright" layout="bottomright"
help_topic="button_tab" help_topic="button_tab"
name="button_panel" name="button_panel"
left="5" left="5"
bottom="5" bottom="2"
width="313"> width="313">
<button <button
follows="bottom|right" height="23"
height="25"
label="Cancel" label="Cancel"
layout="topleft" layout="topleft"
name="cancel_btn" name="cancel_btn"
right="-1" right="-1"
left_pad="10"
width="100" /> width="100" />
</panel> </panel>
</panel> </panel>
\ No newline at end of file
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+ 302
− 243
View file @ 16ae542f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
name="object properties" name="object properties"
help_topic="object_properties" help_topic="object_properties"
save_rect="true" save_rect="true"
title="Object Properties" title="Object Profile"
width="333"> width="333">
<panel.string <panel.string
name="text deed continued"> name="text deed continued">
...@@ -57,127 +57,173 @@ ...@@ -57,127 +57,173 @@
Mixed Sale Mixed Sale
</panel.string> </panel.string>
<button <button
follows="top|right" follows="top|right"
height="25" height="23"
image_overlay="BackArrow_Off" image_overlay="BackArrow_Off"
layout="topleft" layout="topleft"
name="back_btn" left="10"
picture_style="true" name="back_btn"
right="-5" tab_stop="false"
tab_stop="false" top="0"
top="0" width="23" />
width="25" /> <text
follows="top|left|right"
font="SansSerifHuge"
height="26"
layout="topleft"
left_pad="10"
name="title"
text_color="LtGray"
top="0"
use_ellipses="true"
value="Object Profile"
width="275" />
<text
follows="top|left"
height="13"
layout="topleft"
left="45"
name="where"
text_color="LtGray_50"
value="(In World)"
width="150" />
<panel <panel
follows="all" follows="all"
height="500" height="490"
label="" label=""
layout="topleft" layout="topleft"
left="5" left="10"
help_topic="" help_topic=""
top="30" top="45"
border="1" width="313"
width="313"> background_visible="true"
<text bg_alpha_color="DkGray2">
type="string" <text
length="1" type="string"
follows="left|top" length="1"
height="10" follows="left|top"
layout="topleft" height="10"
left="10" layout="topleft"
left="5"
name="Name:" name="Name:"
top_pad="5" top="10"
width="90"> width="78">
Name: Name:
</text> </text>
<line_editor <line_editor
follows="left|top|right" border_style="line"
height="19" border_thickness="1"
layout="topleft" follows="left|top|right"
left_pad="0" height="20"
max_length="63" layout="topleft"
left_delta="78"
max_length="63"
name="Object Name" name="Object Name"
select_on_focus="true" top_delta="0"
top_delta="0" width="225" />
width="170" /> <text
<text type="string"
type="string" length="1"
length="1" follows="left|top"
follows="left|top" height="10"
height="10" layout="topleft"
layout="topleft" left="5"
left="10"
name="Description:" name="Description:"
top_pad="3" top_pad="10"
width="90"> width="78">
Description: Description:
</text> </text>
<line_editor <line_editor
border_style="line"
border_thickness="1"
follows="left|top|right" follows="left|top|right"
height="19" height="23"
layout="topleft" layout="topleft"
left_pad="0"
max_length="127"
name="Object Description" name="Object Description"
select_on_focus="true" select_on_focus="true"
top_delta="0" left_delta="78"
width="170" /> max_length="127"
<text top_delta="-5"
type="string" width="225"/>
left="10" <text
length="1" type="string"
follows="left|top" length="1"
height="19" follows="left|top"
layout="topleft" height="23"
name="Creator:" layout="topleft"
width="90"> left="5"
Creator: name="CreatorNameLabel"
</text> top_pad="10"
<text width="78">
type="string" Creator:
length="1" </text>
follows="left|top" <avatar_icon
left_pad="0" follows="top|left"
height="19" height="20"
layout="topleft" default_icon_name="Generic_Person"
layout="topleft"
left_pad="0"
top_delta="-6"
mouse_opaque="true"
width="20" />
<text
type="string"
follows="left|right"
font="SansSerifSmall"
height="15"
layout="topleft"
left_pad="5"
name="Creator Name" name="Creator Name"
width="175"> top_delta="6"
Esbee Linden width="140">
</text> Erica Linden
<text </text>
type="string" <text
length="1" type="string"
left="10" length="1"
follows="left|top" follows="left|top"
height="19" height="23"
layout="topleft" layout="topleft"
name="Owner:" left="5"
width="90"> name="Owner:"
Owner: top_pad="10"
</text> width="78">
<text Owner:
type="string" </text>
length="1" <avatar_icon
follows="left|top" follows="top|left"
height="19" height="20"
layout="topleft" default_icon_name="Generic_Person"
name="Owner Name" layout="topleft"
left_pad="0" left_pad="0"
width="175"> top_delta="-6"
Erica Linden mouse_opaque="true"
</text> width="20" />
<text <text
type="string" type="string"
length="1" follows="left|right"
follows="left|top" font="SansSerifSmall"
layout="topleft" height="15"
left="10" layout="topleft"
height="18" left_pad="5"
name="Group:" name="Owner Name"
top_pad="4" top_delta="6"
width="75"> width="140">
Group: Erica Linden
</text> </text>
<button <text
type="string"
length="1"
follows="left|top"
height="23"
layout="topleft"
left="5"
name="Group_label"
top_pad="10"
width="78">
Group:
</text>
<button
follows="top|left" follows="top|left"
height="10" height="10"
image_disabled="Activate_Checkmark" image_disabled="Activate_Checkmark"
...@@ -203,43 +249,34 @@ ...@@ -203,43 +249,34 @@
width="150" /> width="150" />
<button <button
follows="top|left" follows="top|left"
height="20" height="23"
label="Deed" label="Deed"
label_selected="Deed" label_selected="Deed"
layout="topleft" layout="topleft"
name="button deed" name="button deed"
top_pad="0" top_pad="0"
left="100" left="81"
tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer." tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
width="80" />
<check_box
height="19"
follows="left|top"
label="Share"
layout="topleft"
name="checkbox share with group"
tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
left_pad="3"
width="100" /> width="100" />
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
height="16" height="9"
layout="topleft" layout="topleft"
top_pad="15" top_pad="5"
left="10" left="5"
name="label click action" name="label click action"
width="90"> width="280">
Click to: Click to:
</text> </text>
<combo_box <combo_box
follows="left|top" follows="left|top"
height="20" height="23"
layout="topleft" layout="topleft"
name="clickaction" name="clickaction"
width="168" width="168"
left_pad="0"> left="81">
<combo_box.item <combo_box.item
label="Touch (default)" label="Touch (default)"
name="Touch/grab(default)" name="Touch/grab(default)"
...@@ -261,26 +298,131 @@ ...@@ -261,26 +298,131 @@
name="Open" name="Open"
value="Open" /> value="Open" />
</combo_box> </combo_box>
<check_box <panel
height="16" border="false"
follows="left|top"
layout="topleft"
mouse_opaque="false"
background_visible="true"
bg_alpha_color="DkGray"
name="perms_inv"
left="0"
top_pad="15"
height="135"
width="313">
<text
type="string"
length="1"
left="10"
top_pad="15" top_pad="15"
label="For Sale:" text_color="EmphasisColor"
height="15"
follows="left|top|right"
layout="topleft"
name="perm_modify"
width="200">
You can modify this object
</text>
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="10"
name="Anyone can:"
top_pad="8"
width="100">
Anyone:
</text>
<check_box
height="18"
label="Copy"
layout="topleft"
left_pad="0"
name="checkbox allow everyone copy"
top_delta="-2"
width="90" />
<check_box
height="18"
label="Move"
layout="topleft" layout="topleft"
name="checkbox allow everyone move"
left_pad="0"
width="150" />
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="10"
name="GroupLabel"
top_pad="8"
width="100">
Group:
</text>
<check_box
height="18"
label="Share"
layout="topleft"
left_pad="90"
top_delta="-2"
name="checkbox share with group"
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="150" />
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="10"
name="NextOwnerLabel"
top_pad="8"
width="200"
word_wrap="true">
Next owner:
</text>
<check_box
height="18"
label="Modify"
layout="topleft"
left="20"
top_pad="0"
name="checkbox next owner can modify"
width="90" />
<check_box
height="18"
label="Copy"
layout="topleft"
left_pad="0"
name="checkbox next owner can copy"
width="90" />
<check_box
height="18"
label="Transfer"
layout="topleft"
left_pad="0"
name="checkbox next owner can transfer"
tool_tip="Next owner can give away or resell this object"
width="106" />
</panel>
<check_box
height="23"
label="For Sale"
layout="topleft"
left="20"
name="checkbox for sale" name="checkbox for sale"
left="10" top_pad="10"
width="90" /> width="100" />
<!-- NEW SALE TYPE COMBO BOX --> <combo_box
<combo_box height="23"
left_pad="0" left_pad="0"
layout="topleft" layout="topleft"
follows="left|top" follows="left|top"
allow_text_entry="false"
height="20"
intial_value="2"
max_chars="20"
mouse_opaque="true"
name="sale type" name="sale type"
width="158"> width="170">
<combo_box.item <combo_box.item
name="Copy" name="Copy"
label="Copy" label="Copy"
...@@ -293,14 +435,13 @@ ...@@ -293,14 +435,13 @@
name="Original" name="Original"
label="Original" label="Original"
value="1" /> value="1" />
</combo_box> </combo_box>
<!-- NEW PRICE SPINNER --> <spinner
<spinner
follows="left|top" follows="left|top"
decimal_digits="0" decimal_digits="0"
increment="1" increment="1"
top_pad="8" top_pad="10"
left="100" left="120"
control_name="Edit Cost" control_name="Edit Cost"
name="Edit Cost" name="Edit Cost"
label="Price: L$" label="Price: L$"
...@@ -310,106 +451,25 @@ ...@@ -310,106 +451,25 @@
height="20" height="20"
max_val="999999999" /> max_val="999999999" />
<check_box <check_box
height="15" height="20"
width="110" width="110"
top_pad="3" top_pad="6"
label="Show in search" label="Show in search"
layout="topleft" layout="topleft"
left="100" left="120"
name="search_check" name="search_check"
tool_tip="Let people see this object in search results" /> tool_tip="Let people see this object in search results" />
<panel
border="false"
follows="left|top"
layout="topleft"
mouse_opaque="false"
background_visible="true"
bg_alpha_color="DkGray"
name="perms_build"
left="0"
top="241"
height="120"
width="278">
<text
type="string"
length="1"
left="10"
top_pad="9"
text_color="EmphasisColor"
height="16"
follows="left|top|right"
layout="topleft"
name="perm_modify"
width="250">
You can modify this object
</text>
<text
type="string"
follows="left|top"
name="Anyone can:"
width="250"
left="10">
Anyone:
</text>
<check_box
height="19"
label="Move"
layout="topleft"
name="checkbox allow everyone move"
left="15"
width="85" />
<check_box
height="19"
label="Copy"
layout="topleft"
left_pad="0"
name="checkbox allow everyone copy"
width="90" />
<text
type="string"
follows="left|top"
height="19"
name="Next owner can:"
width="250"
left="10">
Next owner:
</text>
<check_box
follows="left|top|right"
label="Modify"
layout="topleft"
left="15"
name="checkbox next owner can modify"
width="85" />
<check_box
follows="left|top|right"
height="19"
label="Copy"
layout="topleft"
left_pad="0"
name="checkbox next owner can copy"
width="90" />
<check_box
follows="left|top|right"
height="19"
label="Transfer"
layout="topleft"
name="checkbox next owner can transfer"
left_pad="0"
top_delta="0"
tool_tip="Next owner can give away or resell this object"
width="90" />
<text <text
type="string" type="string"
text_color="EmphasisColor" text_color="EmphasisColor"
length="1" length="1"
top_pad="5" top_pad="15"
follows="left|top" follows="left|top"
layout="topleft" layout="topleft"
left="10" left="10"
name="B:" name="B:"
height="10" height="10"
width="45"> width="50">
B: B:
</text> </text>
<text <text
...@@ -421,7 +481,7 @@ ...@@ -421,7 +481,7 @@
left_pad="0" left_pad="0"
name="O:" name="O:"
height="10" height="10"
width="44"> width="50">
O: O:
</text> </text>
<text <text
...@@ -433,7 +493,7 @@ ...@@ -433,7 +493,7 @@
left_pad="0" left_pad="0"
name="G:" name="G:"
height="10" height="10"
width="43"> width="50">
G: G:
</text> </text>
<text <text
...@@ -445,7 +505,7 @@ ...@@ -445,7 +505,7 @@
layout="topleft" layout="topleft"
name="E:" name="E:"
height="10" height="10"
width="43"> width="50">
E: E:
</text> </text>
<text <text
...@@ -457,7 +517,7 @@ ...@@ -457,7 +517,7 @@
left_pad="0" left_pad="0"
name="N:" name="N:"
height="10" height="10"
width="48"> width="50">
N: N:
</text> </text>
<text <text
...@@ -473,7 +533,6 @@ ...@@ -473,7 +533,6 @@
F: F:
</text> </text>
</panel> </panel>
</panel>
<panel <panel
height="25" height="25"
layout="bottomright" layout="bottomright"
...@@ -484,30 +543,30 @@ ...@@ -484,30 +543,30 @@
width="313"> width="313">
<button <button
follows="bottom|left" follows="bottom|left"
height="25" height="23"
label="Open" label="Open"
layout="topleft" layout="topleft"
left="5" left="5"
name="open_btn" name="open_btn"
top="0" top="0"
width="60" /> width="100" />
<button <button
follows="bottom|left" follows="bottom|left"
height="25" height="23"
label="Pay" label="Pay"
layout="topleft" layout="topleft"
left_pad="5" left_pad="5"
name="pay_btn" name="pay_btn"
top="0" top="0"
width="50" /> width="100" />
<button <button
follows="bottom|left" follows="bottom|left"
height="25" height="23"
label="Buy" label="Buy"
layout="topleft" layout="topleft"
left_pad="5" left_pad="5"
name="buy_btn" name="buy_btn"
top="0" top="0"
width="60" /> width="100" />
</panel> </panel>
</panel> </panel>
\ No newline at end of file
indra/newview/skins/default/xui/en/widgets/tab_container.xml 100644 → 100755
+ 4
− 4
View file @ 16ae542f
...@@ -20,12 +20,12 @@ label_pad_left - padding to the left of tab button labels ...@@ -20,12 +20,12 @@ label_pad_left - padding to the left of tab button labels
tab_top_image_selected="TabTop_Middle_Selected" tab_top_image_selected="TabTop_Middle_Selected"
tab_bottom_image_unselected="Toolbar_Middle_Off" tab_bottom_image_unselected="Toolbar_Middle_Off"
tab_bottom_image_selected="Toolbar_Middle_Selected" tab_bottom_image_selected="Toolbar_Middle_Selected"
tab_left_image_unselected="TabTop_Middle_Off" tab_left_image_unselected="SegmentedBtn_Left_Disabled"
tab_left_image_selected="TabTop_Middle_Selected"/> tab_left_image_selected="SegmentedBtn_Left_Off"/>
<last_tab tab_top_image_unselected="TabTop_Right_Off" <last_tab tab_top_image_unselected="TabTop_Right_Off"
tab_top_image_selected="TabTop_Right_Selected" tab_top_image_selected="TabTop_Right_Selected"
tab_bottom_image_unselected="Toolbar_Right_Off" tab_bottom_image_unselected="Toolbar_Right_Off"
tab_bottom_image_selected="Toolbar_Right_Selected" tab_bottom_image_selected="Toolbar_Right_Selected"
tab_left_image_unselected="TabTop_Middle_Off" tab_left_image_unselected="SegmentedBtn_Left_Disabled"
tab_left_image_selected="TabTop_Middle_Selected"/> tab_left_image_selected="SegmentedBtn_Left_Off"/>
</tab_container> </tab_container>
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