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

EXT-7201 FIXED Removed extra gear menu button. 

- Removed extra gear button bar from "Edit Outfit" panel.
- Added one more dummy icon to "Add Wearable" panel button bar to chose the right dummy depending on the "Add Wearable" panel visibility.

Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/473/

--HG--
branch : product-engine
meow-7.2.2
Sergei Litovchuk 2010-05-31 22:20:17 +03:00
parent 3517393b4c
commit b3c1e9cd75
3 changed files with 103 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpaneloutfitedit.cpp
View File

@ -259,11 +259,11 @@ BOOL LLPanelOutfitEdit::postBuild()
mFolderViewBtn = getChild<LLButton>("folder_view_btn");
mListViewBtn = getChild<LLButton>("list_view_btn");
mAddToOutfitBtn = getChild<LLButton>("add_to_outfit_btn");
childSetCommitCallback("filter_button", boost::bind(&LLPanelOutfitEdit::showWearablesFilter, this), NULL);
childSetCommitCallback("folder_view_btn", boost::bind(&LLPanelOutfitEdit::showFilteredFolderWearablesPanel, this), NULL);
childSetCommitCallback("list_view_btn", boost::bind(&LLPanelOutfitEdit::showFilteredWearablesPanel, this), NULL);
childSetCommitCallback("gear_menu_btn", boost::bind(&LLPanelOutfitEdit::onGearButtonClick, this, _1), NULL);
childSetCommitCallback("wearables_gear_menu_btn", boost::bind(&LLPanelOutfitEdit::onGearButtonClick, this, _1), NULL);
mCOFWearables = getChild<LLCOFWearables>("cof_wearables_list");
@ -342,6 +342,14 @@ void LLPanelOutfitEdit::toggleAddWearablesPanel()
{
BOOL current_visibility = mAddWearablesPanel->getVisible();
mAddWearablesPanel->setVisible(!current_visibility);
mFolderViewBtn->setVisible(!current_visibility);
mListViewBtn->setVisible(!current_visibility);
mAddToOutfitBtn->setVisible(!current_visibility);
// Change right dummy icon to fill the toggled buttons space.
childSetVisible("add_wearables_dummy_icon", !current_visibility);
childSetVisible("dummy_right_icon", current_visibility);
}
void LLPanelOutfitEdit::showWearablesFilter()

1
indra/newview/llpaneloutfitedit.h
View File

@ -144,6 +144,7 @@ private:
LLButton* mEditWearableBtn;
LLButton* mFolderViewBtn;
LLButton* mListViewBtn;
LLButton* mAddToOutfitBtn;
LLPanel* mAddWearablesPanel;
LLFindNonLinksByMask* mWearableListMaskCollector;

204
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
View File

@ -160,7 +160,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
clip="false"
default_tab_group="2"
follows="all"
height="495"
height="468"
width="313"
layout="topleft"
orientation="vertical"
@ -170,7 +170,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
left="5">
<layout_panel
layout="topleft"
height="220"
height="193"
label="IM Control Panel"
min_height="100"
name="outfit_wearables_panel"
@ -190,40 +190,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
name="cof_wearables_list"
top="0"
width="311" />
<!-- Button bar -->
<panel
background_visible="true"
bevel_style="none"
follows="bottom|left|right"
height="27"
label="bottom_panel"
layout="topleft"
left="0"
name="edit_panel"
top="193"
width="313">
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Left_Over"
image_overlay="OptionsMenu_Off"
image_selected="Toolbar_Left_Selected"
image_unselected="Toolbar_Left_Off"
layout="topleft"
left="0"
name="gear_menu_btn"
top="1"
width="31" />
<icon
follows="bottom|left|right"
height="25"
image_name="Toolbar_Right_Off"
layout="topleft"
left_pad="1"
name="dummy_right_icon"
width="281" />
</panel>
</layout_panel>
@ -232,7 +198,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
bg_alpha_color="DkGray2"
auto_resize="true"
default_tab_group="3"
height="211"
height="184"
min_height="210"
name="add_wearables_panel"
width="313"
@ -360,82 +326,98 @@ It is calculated as border_size + 2*UIResizeBarOverlap
</panel>
</layout_panel>
</layout_stack>
<panel
background_visible="true"
bevel_style="none"
follows="left|right|bottom"
height="27"
label="add_wearables_button_bar"
layout="topleft"
left="0"
name="add_wearables_button_bar"
top_pad="0"
width="313">
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Left_Over"
image_overlay="OptionsMenu_Off"
image_selected="Toolbar_Left_Selected"
image_unselected="Toolbar_Left_Off"
layout="topleft"
left="0"
name="wearables_gear_menu_btn"
top="1"
width="31" />
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Hierarchy_View_Disabled"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
is_toggle="true"
layout="topleft"
left_pad="1"
name="folder_view_btn"
top="1"
width="31" />
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="List_View_On"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
is_toggle="true"
layout="topleft"
left_pad="1"
name="list_view_btn"
top="1"
width="31" />
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="AddItem_Off"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
label=""
layout="topleft"
left_pad="1"
name="add_to_outfit_btn"
top="1"
width="31" />
<icon
follows="bottom|left|right"
height="25"
image_name="Toolbar_Right_Off"
layout="topleft"
left_pad="1"
name="dummy_right_icon"
width="184" >
</icon>
</panel>
</layout_panel>
</layout_panel>
</layout_stack>
<!-- Button bar -->
<panel
background_visible="true"
bevel_style="none"
follows="left|right|bottom"
height="27"
label="add_wearables_button_bar"
layout="topleft"
left="4"
name="add_wearables_button_bar"
top_pad="0"
width="313">
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Left_Over"
image_overlay="OptionsMenu_Off"
image_selected="Toolbar_Left_Selected"
image_unselected="Toolbar_Left_Off"
layout="topleft"
left="0"
name="wearables_gear_menu_btn"
top="1"
width="31" />
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Hierarchy_View_Disabled"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
is_toggle="true"
layout="topleft"
left_pad="1"
name="folder_view_btn"
top="1"
visible="false"
width="31" />
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="List_View_On"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
is_toggle="true"
layout="topleft"
left_pad="1"
name="list_view_btn"
top="1"
visible="false"
width="31" />
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="AddItem_Off"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
label=""
layout="topleft"
left_pad="1"
name="add_to_outfit_btn"
top="1"
visible="false"
width="31" />
<icon
follows="bottom|left|right"
height="25"
image_name="Toolbar_Right_Off"
layout="topleft"
left_pad="1"
name="add_wearables_dummy_icon"
top="1"
visible="false"
width="184" >
</icon>
<icon
follows="bottom|left|right"
height="25"
image_name="Toolbar_Right_Off"
layout="topleft"
left="32"
name="dummy_right_icon"
top="1"
width="281" >
</icon>
</panel>
<panel
follows="left|right|bottom"
height="30"