livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Hooked up build FUI toolbar button 

* Added Shop button to status bar
* Changed "Inventory..." menu item to go to same window as toolbar inventory button
master
Leslie Linden 2011-10-13 16:48:59 -07:00
parent 4c663ca8b9
commit c054f1faed
6 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/commands.xml
View File

@ -35,7 +35,7 @@
icon="Command_Build_Icon"
label_ref="Command_Build_Label"
tooltip_ref="Command_Build_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
execute_function="Build.Toggle"
execute_parameters="build"
is_enabled_function="Agent.IsActionAllowed"
is_enabled_parameters="build"

5
indra/newview/llstatusbar.cpp
View File

@ -169,6 +169,8 @@ BOOL LLStatusBar::postBuild()
getChild<LLUICtrl>("buyL")->setCommitCallback(
boost::bind(&LLStatusBar::onClickBuyCurrency, this));
getChild<LLUICtrl>("goShop")->setCommitCallback(boost::bind(&LLWeb::loadURLExternal, gSavedSettings.getString("MarketplaceURL")));
mBoxBalance = getChild<LLTextBox>("balance");
mBoxBalance->setClickedCallback( &LLStatusBar::onClickBalance, this );
@ -345,9 +347,10 @@ void LLStatusBar::setBalance(S32 balance)
const S32 HPAD = 24;
LLRect balance_rect = mBoxBalance->getTextBoundingRect();
LLRect buy_rect = getChildView("buyL")->getRect();
LLRect shop_rect = getChildView("goShop")->getRect();
LLView* balance_bg_view = getChildView("balance_bg");
LLRect balance_bg_rect = balance_bg_view->getRect();
balance_bg_rect.mLeft = balance_bg_rect.mRight - (buy_rect.getWidth() + balance_rect.getWidth() + HPAD);
balance_bg_rect.mLeft = balance_bg_rect.mRight - (buy_rect.getWidth() + shop_rect.getWidth() + balance_rect.getWidth() + HPAD);
balance_bg_view->setShape(balance_bg_rect);
}

1
indra/newview/skins/default/textures/textures.xml
View File

@ -137,6 +137,7 @@ with the same filename but different name
<texture name="Command_Inventory_Icon" file_name="toolbar_icons/inventory.png" preload="true" />
<texture name="Command_Map_Icon" file_name="toolbar_icons/map.png" preload="true" />
<texture name="Command_Marketplace_Icon" file_name="toolbar_icons/marketplace.png" preload="true" />
<texture name="Command_MiniCart_Icon" file_name="toolbar_icons/mini_cart.png" preload="true" />
<texture name="Command_MiniMap_Icon" file_name="toolbar_icons/mini_map.png" preload="true" />
<texture name="Command_Move_Icon" file_name="toolbar_icons/move.png" preload="true" />
<texture name="Command_People_Icon" file_name="toolbar_icons/people.png" preload="true" />

BIN
indra/newview/skins/default/textures/toolbar_icons/mini_cart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

18
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -34,25 +34,13 @@
<menu_item_check
label="Inventory..."
name="Inventory"
shortcut="control|shift|I"
visible="false">
shortcut="control|I"
visible="true">
<menu_item_check.on_check
function="Floater.Visible"
parameter="inventory" />
<menu_item_check.on_click
function="Floater.Toggle"
parameter="inventory" />
</menu_item_check>
<menu_item_check
label="Inventory..."
name="ShowSidetrayInventory"
shortcut="control|I"
visible="true">
<menu_item_check.on_check
function="SidetrayPanelVisible"
parameter="my_inventory" />
<menu_item_check.on_click
function="ShowSidetrayPanel"
function="Floater.Toggle"
parameter="my_inventory" />
</menu_item_check>
<menu_item_check

27
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -35,8 +35,8 @@
</panel.string>
<panel
height="18"
left="-315"
width="95"
left="-370"
width="150"
top="1"
follows="right|top"
name="balance_bg"
@ -64,7 +64,7 @@
image_unselected="buy_off"
image_pressed="buy_press"
height="18"
label="BUY L$"
label="Buy L$"
label_color="White"
left_pad="0"
label_shadow="true"
@ -74,6 +74,27 @@
tool_tip="Click to buy more L$"
top="0"
width="55" />
<button
halign="left"
font="SansSerifSmall"
follows="right|top|bottom"
imgoverlay_label_space="7"
image_overlay="Command_MiniCart_Icon"
image_overlay_alignment="left"
image_hover_unselected="buy_over"
image_unselected="buy_off"
image_pressed="buy_press"
height="18"
label="Shop"
label_color="White"
left_pad="0"
label_shadow="true"
name="goShop"
pad_right="0"
pad_bottom="2"
tool_tip="Go shopping"
top="0"
width="55" />
</panel>
<text
type="string"