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

EXT-2377 : Add XML switch to showing either menubar or gear menu 

Reverting previous checkin for enabling this.  This is more complicated than worth spending time on, at the moment.
meow-7.2.2
Loren Shih 2009-11-11 18:13:43 -05:00
parent 0cc89785d6
commit 2117b096d7
4 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llpanelmaininventory.cpp
View File

@ -49,7 +49,7 @@
#include "llviewermenu.h"
#include "llviewertexturelist.h"
static LLDefaultChildRegistry::Register<LLPanelMainInventory> r("panel_main_inventory");
static LLRegisterPanelClassWrapper<LLPanelMainInventory> t_inventory("panel_main_inventory"); // Seraph is this redundant with constructor?
void on_file_loaded_for_save(BOOL success,
LLViewerFetchedTexture *src_vi,
@ -90,8 +90,8 @@ private:
/// LLPanelMainInventory
///----------------------------------------------------------------------------
LLPanelMainInventory::LLPanelMainInventory(const LLPanelMainInventory::Params& p)
: LLPanel(p),
LLPanelMainInventory::LLPanelMainInventory()
: LLPanel(),
mActivePanel(NULL),
mSavedFolderState(NULL),
mFilterText(""),
@ -124,24 +124,6 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanelMainInventory::Params& p
mSavedFolderState = new LLSaveFolderState();
mSavedFolderState->setApply(FALSE);
if (p.hide_top_menu)
{
LLInventoryPanel *top_panel = getChild<LLInventoryPanel>("top_panel");
if (top_panel)
{
top_panel->setVisible(FALSE);
}
}
if (p.hide_bottom_menu)
{
LLInventoryPanel *bottom_panel = getChild<LLInventoryPanel>("bottom_panel");
if (bottom_panel)
{
bottom_panel->setVisible(FALSE);
}
}
}
BOOL LLPanelMainInventory::postBuild()
@ -222,11 +204,6 @@ void LLPanelMainInventory::initListCommandsHandlers()
mListCommands->childSetAction("options_gear_btn", boost::bind(&LLPanelMainInventory::onGearButtonClick, this));
mListCommands->childSetAction("trash_btn", boost::bind(&LLPanelMainInventory::onTrashButtonClick, this));
mListCommands->childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddButtonClick, this));
/*
mListCommands->getChild<LLButton>("add_btn")->setHeldDownCallback(boost::bind(&LLPanelMainInventory::onAddButtonHeldDown, this));
static const LLSD add_landmark_command("add_landmark");
mListCommands->childSetAction("add_btn", boost::bind(&LLPanelMainInventory::onAddAction, this, add_landmark_command));
*/
LLDragAndDropButton* trash_btn = mListCommands->getChild<LLDragAndDropButton>("trash_btn");
trash_btn->setDragAndDropHandler(boost::bind(&LLPanelMainInventory::handleDragAndDropToTrash, this

14
indra/newview/llpanelmaininventory.h
View File

@ -58,19 +58,7 @@ class LLPanelMainInventory : public LLPanel, LLInventoryObserver
public:
friend class LLFloaterInventoryFinder;
struct Params
: public LLInitParam::Block<Params, LLPanel::Params>
{
Optional<bool> hide_top_menu;
Optional<bool> hide_bottom_menu;
Params() :
hide_top_menu("hide_top_menu", false),
hide_bottom_menu("hide_bottom_menu", false)
{}
};
LLPanelMainInventory(const Params&);
LLPanelMainInventory();
~LLPanelMainInventory();
BOOL postBuild();

12
indra/newview/skins/default/xui/en/panel_main_inventory.xml
View File

@ -103,17 +103,6 @@
width="18" />
</panel>
<panel
background_visible="true"
bevel_style="none"
bottom="0"
follows="left|right|bottom"
height="30"
layout="bottomleft"
left="0"
visible="true"
name="top_panel"
width="330">
<menu_bar
bg_visible="false"
follows="left|top|right"
@ -475,5 +464,4 @@
</menu_item_check>
</menu>
</menu_bar>
</panel>
</panel>

1
indra/newview/skins/default/xui/en/sidepanel_inventory.xml
View File

@ -24,7 +24,6 @@
filename="panel_main_inventory.xml"
follows="all"
layout="topleft"
hide_top_panel="true"
left="0"
name="panel_main_inventory"
top="0"