summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorLeslie Linden <none@none>2011-06-06 17:00:59 -0700
committerLeslie Linden <none@none>2011-06-06 17:00:59 -0700
commit98bcd9e2efe4cc0dc5e51da09c6f18424b9d9144 (patch)
treebc60274730d7515c1088f7d4a99cb6308297474b /indra/newview/skins/default/xui/en
parent0c0f7558782edccda375609777967184b8440441 (diff)
EXP-859 FIX -- Save setting for last time inbox expanded
EXP-841 PROGRESS -- Create outbox sync button with basic enable/disable logic and animation EXP-866 PROGRESS -- Create inbox observer to dynamically update inbox item count and badge value EXP-872 PROGRESS -- Hide inbox and outbox unless applicable Inbox expansion time is now saved as setting variable "LastInventoryInboxExpand". New outbox sync button art. Observers for items and categories are now implemented in the LLSidepanelInventory but the exact method of use is still to be determined. Functions are in place to show and hide the inbox and outbox panels but the logic around the decision is TBD. The resize bar for the inbox/outbox is now disabled when both inbox and outbox are collapsed. Reviewed by Leyla.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml117
1 files changed, 61 insertions, 56 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 91de3047e6..c945f27ac6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -89,21 +89,21 @@
width="308"
top="35"
bg_opaque_color="InventoryBackgroundColor"
- background_visible="true"
- background_opaque="true"
+ background_visible="true"
+ background_opaque="true"
>
<text
type="string"
- length="1"
- follows="top|left|right"
- font="SansSerifSmall"
+ length="1"
+ follows="top|left|right"
+ font="SansSerifSmall"
use_ellipses="true"
name="move_items_text"
- top="10"
- left="4"
- height="20"
- width="304"
- >Move items to your inventory to manage and use them.</text>
+ top="10"
+ left="4"
+ height="20"
+ width="304"
+ >Move items to your inventory to manage and use them.</text>
<inventory_panel
bg_opaque_color="DkGray2"
bg_alpha_color="DkGray2"
@@ -125,14 +125,14 @@
</panel>
</layout_panel>
<layout_panel
- width="330"
- auto_resize="true"
+ width="330"
+ auto_resize="true"
user_resize="false"
- follows="bottom|left|right"
- name="outbox_layout_panel"
- min_dim="35"
- max_dim="125"
- height="35">
+ follows="bottom|left|right"
+ name="outbox_layout_panel"
+ min_dim="35"
+ max_dim="125"
+ height="35">
<panel
follows="all"
layout="topleft"
@@ -144,52 +144,57 @@
height="125"
width="310">
<button
- label="MARKETPLACE OUTBOX"
- is_toggle="true"
- name="outbox_btn"
- follows="top|left|right"
- image_unselected="MarketplaceBtn_Off"
- image_selected="MarketplaceBtn_Selected"
- height="35"
- tab_stop="false"
- width="308"
- halign="left"
- pad_left="35"
- top="0"
- left="0" />
- <button
- image_disabled="Sync_Disabled"
- image_disabled_selected="Sync_Disabled"
- image_unselected="Sync_Enabled"
- image_selected="Sync_Enabled"
- label=""
- is_toggle="false"
- name="outbox_sync_btn"
- follows="top|right"
- height="16"
+ label="MARKETPLACE OUTBOX"
+ is_toggle="true"
+ name="outbox_btn"
+ follows="top|left|right"
+ image_unselected="MarketplaceBtn_Off"
+ image_selected="MarketplaceBtn_Selected"
+ height="35"
tab_stop="false"
- width="16"
- halign="center"
- top="10"
- left="-40"
- enabled="false" />
+ width="308"
+ halign="left"
+ pad_left="35"
+ top="0"
+ left="0" />
+ <button
+ image_unselected="OutboxPush_Off"
+ image_selected="OutboxPush_Selected"
+ image_hover_selected="OutboxPush_Selected_Over"
+ image_hover_unselected="OutboxPush_Over"
+ image_disabled_selected="OutboxPush_Selected_Disabled"
+ image_disabled="OutboxPush_Disabled"
+ image_pressed="OutboxPush_Press"
+ image_pressed_selected="OutboxPush_Selected_Press"
+ label=""
+ tool_tip="Push to my Marketplace Storefront"
+ is_toggle="false"
+ name="outbox_sync_btn"
+ follows="top|right"
+ tab_stop="false"
+ halign="center"
+ top="6"
+ left="-50"
+ height="23"
+ width="32"
+ enabled="false" />
<loading_indicator
follows="top|right"
name="outbox_sync_indicator"
- top="10"
- left="-40"
- height="16"
- width="16"
- images_per_sec="1.0"
+ top="6"
+ left="-50"
+ height="23"
+ width="32"
+ images_per_sec="1.15"
tab_stop="false"
visible="false">
<images>
- <image name="Sync_Progress_1"/>
- <image name="Sync_Progress_2"/>
- <image name="Sync_Progress_3"/>
- <image name="Sync_Progress_4"/>
- <image name="Sync_Progress_5"/>
- <image name="Sync_Progress_6"/>
+ <image name="OutboxPush_Progress_1"/>
+ <image name="OutboxPush_Progress_2"/>
+ <image name="OutboxPush_Progress_3"/>
+ <image name="OutboxPush_Progress_4"/>
+ <image name="OutboxPush_Progress_5"/>
+ <image name="OutboxPush_Progress_6"/>
</images>
</loading_indicator>
<panel