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

Merge

master
Paul ProductEngine 2011-09-28 17:14:50 +03:00
parent 87db6c59ee 8fd2d69fdf
commit c44db34a15
15 changed files with 70 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llbottomtray.cpp
View File

@ -31,6 +31,7 @@
// library includes
#include "llfloaterreg.h"
#include "llfloatersidepanelcontainer.h"
#include "llflyoutbutton.h"
#include "lllayoutstack.h"
#include "llnotifications.h"
@ -856,7 +857,7 @@ void LLBottomTray::draw()
}
getChild<LLButton>("show_profile_btn")->setToggleState(LLAvatarActions::profileVisible(gAgent.getID()));
LLPanel* panel = LLSideTray::getInstance()->getPanel("panel_people");
LLPanel* panel = LLFloaterSidePanelContainer::getPanel("people", "panel_people");
if (panel && panel->isInVisibleChain())
{
getChild<LLButton>("show_people_button")->setToggleState(true);

3
indra/newview/llchathistory.cpp
View File

@ -42,6 +42,7 @@
#include "llavataractions.h"
#include "lltrans.h"
#include "llfloaterreg.h"
#include "llfloatersidepanelcontainer.h"
#include "llmutelist.h"
#include "llstylemap.h"
#include "llslurl.h"
@ -144,7 +145,7 @@ public:
{
LLMuteList::getInstance()->add(LLMute(getAvatarId(), mFrom, LLMute::OBJECT));
LLSideTray::getInstance()->showPanel("panel_block_list_sidetray", LLSD().with("blocked_to_select", getAvatarId()));
LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD().with("blocked_to_select", getAvatarId()));
}
}

3
indra/newview/llfloaterpreference.cpp
View File

@ -50,6 +50,7 @@
#include "llfloaterreg.h"
#include "llfloaterabout.h"
#include "llfloaterhardwaresettings.h"
#include "llfloatersidepanelcontainer.h"
#include "llimfloater.h"
#include "llkeyboard.h"
#include "llmodaldialog.h"
@ -1499,7 +1500,7 @@ void LLFloaterPreference::onClickBlockList()
// don't create side tray on demand
if (LLSideTray::instanceCreated())
{
LLSideTray::getInstance()->showPanel("panel_block_list_sidetray");
LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD());
}
}

14
indra/newview/llfloatersidepanelcontainer.cpp
View File

@ -80,18 +80,28 @@ LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_na
return panel;
}
void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const LLSD& panel_name)
void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const LLSD& key)
{
LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
if (floaterp)
{
floaterp->openChildPanel(sMainPanelName, panel_name);
floaterp->openChildPanel(sMainPanelName, key);
}
}
void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key)
{
LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
if (floaterp)
{
floaterp->openChildPanel(panel_name, key);
}
}
LLPanel* LLFloaterSidePanelContainer::getPanel(const std::string& floater_name, const std::string& panel_name)
{
LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
if (floaterp)
{
return floaterp->findChild<LLPanel>(panel_name, true);

6
indra/newview/llfloatersidepanelcontainer.h
View File

@ -53,10 +53,12 @@ public:
LLPanel* openChildPanel(const std::string& panel_name, const LLSD& params);
static void showPanel(const std::string& floater_name, const LLSD& panel_name);
static void showPanel(const std::string& floater_name, const LLSD& key);
static void showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key);
static LLPanel* getPanel(const std::string& floater_name, const std::string& panel_name = sMainPanelName);
/**
* Gets the panel of given type T (doesn't show it or do anything else with it).
*

15
indra/newview/llgroupactions.cpp
View File

@ -34,6 +34,7 @@
#include "llagent.h"
#include "llcommandhandler.h"
#include "llfloaterreg.h"
#include "llfloatersidepanelcontainer.h"
#include "llgroupmgr.h"
#include "llimview.h" // for gIMMgr
#include "llnotificationsutil.h"
@ -83,7 +84,7 @@ public:
{
LLSD params;
params["people_panel_tab_name"] = "groups_panel";
LLSideTray::getInstance()->showPanel("panel_people", params);
LLFloaterSidePanelContainer::showPanel("people", "panel_people", params);
return true;
}
return false;
@ -243,7 +244,7 @@ static bool isGroupUIVisible()
{
static LLPanel* panel = 0;
if(!panel)
panel = LLSideTray::getInstance()->getPanel("panel_group_info_sidetray");
panel = LLFloaterSidePanelContainer::getPanel("people", "panel_group_info_sidetray");
if(!panel)
return false;
return panel->isInVisibleChain();
@ -265,7 +266,7 @@ void LLGroupActions::show(const LLUUID& group_id)
params["group_id"] = group_id;
params["open_tab_name"] = "panel_group_info_sidetray";
LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
LLFloaterSidePanelContainer::showPanel("people", "panel_group_info_sidetray", params);
}
void LLGroupActions::refresh_notices()
@ -278,7 +279,7 @@ void LLGroupActions::refresh_notices()
params["open_tab_name"] = "panel_group_info_sidetray";
params["action"] = "refresh_notices";
LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
LLFloaterSidePanelContainer::showPanel("people", "panel_group_info_sidetray", params);
}
//static
@ -292,7 +293,7 @@ void LLGroupActions::refresh(const LLUUID& group_id)
params["open_tab_name"] = "panel_group_info_sidetray";
params["action"] = "refresh";
LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
LLFloaterSidePanelContainer::showPanel("people", "panel_group_info_sidetray", params);
}
//static
@ -303,7 +304,7 @@ void LLGroupActions::createGroup()
params["open_tab_name"] = "panel_group_info_sidetray";
params["action"] = "create";
LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
LLFloaterSidePanelContainer::showPanel("people", "panel_group_info_sidetray", params);
}
//static
@ -317,7 +318,7 @@ void LLGroupActions::closeGroup(const LLUUID& group_id)
params["open_tab_name"] = "panel_group_info_sidetray";
params["action"] = "close";
LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
LLFloaterSidePanelContainer::showPanel("people", "panel_group_info_sidetray", params);
}

3
indra/newview/llnearbychat.cpp
View File

@ -33,6 +33,7 @@
//#include "llchatitemscontainerctrl.h"
#include "lliconctrl.h"
#include "llsidetray.h"
#include "llfloatersidepanelcontainer.h"
#include "llfocusmgr.h"
#include "llresizebar.h"
#include "llresizehandle.h"
@ -203,7 +204,7 @@ void LLNearbyChat::onNearbySpeakers()
{
LLSD param;
param["people_panel_tab_name"] = "nearby_panel";
LLSideTray::getInstance()->showPanel("panel_people",param);
LLFloaterSidePanelContainer::showPanel("people", "panel_people", param);
}

3
indra/newview/llpanelblockedlist.cpp
View File

@ -37,6 +37,7 @@
// project include
#include "llfloateravatarpicker.h"
#include "llfloatersidepanelcontainer.h"
#include "llsidetray.h"
#include "llsidetraypanelcontainer.h"
@ -99,7 +100,7 @@ void LLPanelBlockedList::selectBlocked(const LLUUID& mute_id)
void LLPanelBlockedList::showPanelAndSelect(const LLUUID& idToSelect)
{
LLSideTray::getInstance()->showPanel("panel_block_list_sidetray", LLSD().with(BLOCKED_PARAM_NAME, idToSelect));
LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD().with(BLOCKED_PARAM_NAME, idToSelect));
}

5
indra/newview/llpanelgroup.cpp
View File

@ -29,6 +29,7 @@
// Library includes
#include "llbutton.h"
#include "llfloatersidepanelcontainer.h"
#include "lltabcontainer.h"
#include "lltextbox.h"
#include "lluictrlfactory.h"
@ -597,7 +598,7 @@ void LLPanelGroup::showNotice(const std::string& subject,
//static
void LLPanelGroup::refreshCreatedGroup(const LLUUID& group_id)
{
LLPanelGroup* panel = LLSideTray::getInstance()->getPanel<LLPanelGroup>("panel_group_info_sidetray");
LLPanelGroup* panel = LLFloaterSidePanelContainer::getPanel<LLPanelGroup>("people", "panel_group_info_sidetray");
if(!panel)
return;
panel->setGroupID(group_id);
@ -612,7 +613,7 @@ void LLPanelGroup::showNotice(const std::string& subject,
const std::string& inventory_name,
LLOfferInfo* inventory_offer)
{
LLPanelGroup* panel = LLSideTray::getInstance()->getPanel<LLPanelGroup>("panel_group_info_sidetray");
LLPanelGroup* panel = LLFloaterSidePanelContainer::getPanel<LLPanelGroup>("people", "panel_group_info_sidetray");
if(!panel)
return;

13
indra/newview/llpanelpeople.cpp
View File

@ -29,6 +29,7 @@
// libs
#include "llavatarname.h"
#include "llfloaterreg.h"
#include "llfloatersidepanelcontainer.h"
#include "llmenubutton.h"
#include "llmenugl.h"
#include "llnotificationsutil.h"
@ -1283,6 +1284,10 @@ void LLPanelPeople::onFriendsViewSortMenuItemClicked(const LLSD& userdata)
mAllFriendList->showPermissions(show_permissions);
mOnlineFriendList->showPermissions(show_permissions);
}
else if (chosen_item == "panel_block_list_sidetray")
{
LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD());
}
}
void LLPanelPeople::onGroupsViewSortMenuItemClicked(const LLSD& userdata)
@ -1315,6 +1320,10 @@ void LLPanelPeople::onNearbyViewSortMenuItemClicked(const LLSD& userdata)
{
setSortOrder(mNearbyList, E_SORT_BY_DISTANCE);
}
else if (chosen_item == "panel_block_list_sidetray")
{
LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD());
}
}
bool LLPanelPeople::onNearbyViewSortMenuItemCheck(const LLSD& userdata)
@ -1348,6 +1357,10 @@ void LLPanelPeople::onRecentViewSortMenuItemClicked(const LLSD& userdata)
{
mRecentList->toggleIcons();
}
else if (chosen_item == "panel_block_list_sidetray")
{
LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD());
}
}
bool LLPanelPeople::onFriendsViewSortMenuItemCheck(const LLSD& userdata)

7
indra/newview/llpanelpicks.cpp
View File

@ -35,6 +35,7 @@
#include "lldispatcher.h"
#include "llflatlistview.h"
#include "llfloaterreg.h"
#include "llfloatersidepanelcontainer.h"
#include "llfloaterworldmap.h"
#include "llnotificationsutil.h"
#include "lltexturectrl.h"
@ -269,11 +270,7 @@ public:
params["classified_name"] = c_info->name;
params["classified_desc"] = c_info->description;
params["from_search"] = true;
LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>("people");
if (floaterp)
{
floaterp->openChildPanel("panel_profile_view", params);
}
LLFloaterSidePanelContainer::showPanel("people", "panel_profile_view", params);
}
else if (mRequestVerb == "edit")
{

28
indra/newview/skins/default/xui/en/floater_people.xml
View File

@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<floater
can_close="true"
can_resize="true"
height="570"
help_topic="sidebar_people"
min_width="333"
min_height="440"
name="floater_people"
save_rect="true"
save_visibility="true"
title="People"
width="333" >
can_close="true"
can_resize="true"
height="570"
help_topic="sidebar_people"
min_height="440"
min_width="333"
layout="topleft"
name="floater_people"
save_rect="true"
single_instance="true"
title="PEOPLE"
width="333">
<panel_container
default_panel_name="panel_people"
follows="all"
height="570"
name="main_panel"
default_panel_name="panel_people"
width="333">
<panel
class="panel_people"

2
indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
View File

@ -42,6 +42,6 @@
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
<menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" />
<menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
</menu_item_call>
</toggleable_menu>

2
indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
View File

@ -52,6 +52,6 @@
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
<menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
<menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" />
</menu_item_call>
</toggleable_menu>

2
indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
View File

@ -34,6 +34,6 @@
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
<menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
<menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
</menu_item_call>
</toggleable_menu>