ACME-272 : Add the top toolbar to the FBC panel 2

2 files changed, 96 insertions, 4 deletions

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 86303cee70..12d8f6b83a 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -672,6 +672,7 @@ BOOL LLPanelPeople::postBuild()
 	getChild<LLFilterEditor>("friends_filter_input")->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2));
 	getChild<LLFilterEditor>("groups_filter_input")->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2));
 	getChild<LLFilterEditor>("recent_filter_input")->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2));
+	getChild<LLFilterEditor>("fbc_filter_input")->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2));
 
 	mTabContainer = getChild<LLTabContainer>("tabs");
 	mTabContainer->setCommitCallback(boost::bind(&LLPanelPeople::onTabSelected, this, _2));
@@ -729,7 +730,8 @@ BOOL LLPanelPeople::postBuild()
 	LLPersonModelCommon* base_item = new LLPersonModelCommon(mPersonFolderViewModel);
 
 	LLPersonFolderView::Params folder_view_params(LLUICtrlFactory::getDefaultParams<LLPersonFolderView>());
-	folder_view_params.parent_panel = friends_tab;
+    
+	folder_view_params.parent_panel = socialtwo_tab;
 	folder_view_params.listener = base_item;
 	folder_view_params.view_model = &mPersonFolderViewModel;
 	folder_view_params.root = NULL;
@@ -740,8 +742,8 @@ BOOL LLPanelPeople::postBuild()
 
 	//Create scroller
 	LLRect scroller_view_rect = socialtwo_tab->getRect();
-	scroller_view_rect.mTop -= 4;
-	scroller_view_rect.mRight -=6;
+	scroller_view_rect.mTop -= 2+27; // 27 is the height of the top toolbar
+	scroller_view_rect.mRight -= 4;
 	scroller_view_rect.mLeft += 2;
 	LLScrollContainer::Params scroller_params(LLUICtrlFactory::getDefaultParams<LLFolderViewScrollContainer>());
 	scroller_params.rect(scroller_view_rect);
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index c4db547a8e..9bab2ccb0b 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -633,6 +633,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            top="0"
            right="-1" />
         </panel>
+        
+<!-- ================================= FBC TEST tab (Temporary) ========================== -->
+        
         <panel
            background_opaque="true"
            background_visible="true"
@@ -725,6 +728,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              />
           </panel>
         </panel>
+        
+<!-- ================================= FBC TEST TWO tab (Final, to be renamed) ========================== -->
+        
         <panel
            background_opaque="true"
            background_visible="true"
@@ -737,6 +743,90 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            left="0"
            help_topic="people_fbctest_tab"
            name="fbctesttwo_panel"
-           top="0"/>      
+           top="0">
+            <panel
+                follows="left|top|right"
+                height="27"
+                label="bottom_panel"
+                layout="topleft"
+                left="0"
+                name="fbc_buttons_panel"
+                right="-1"
+                top="0">
+                <filter_editor
+                follows="left|top|right"
+                height="23"
+                layout="topleft"
+                left="6"
+                label="Filter People"
+                max_length_chars="300"
+                name="fbc_filter_input"
+                text_color="Black"
+                text_pad_left="10"
+                top="4"
+                width="177" />
+                <button
+                commit_callback.function="People.Gear"
+                follows="right"
+                height="25"
+                image_hover_unselected="Toolbar_Middle_Over"
+                image_overlay="OptionsMenu_Off"
+                image_selected="Toolbar_Middle_Selected"
+                image_unselected="Toolbar_Middle_Off"
+                layout="topleft"
+                left_pad="8"
+                name="gear_btn"
+                tool_tip="Actions on selected person"
+                top="3"
+                width="31" />
+                <menu_button
+                follows="right"
+                height="25"
+                image_hover_unselected="Toolbar_Middle_Over"
+                image_overlay="Conv_toolbar_sort"
+                image_selected="Toolbar_Middle_Selected"
+                image_unselected="Toolbar_Middle_Off"
+                layout="topleft"
+                left_pad="2"
+                menu_filename="menu_people_friends_view.xml"
+                menu_position="bottomleft"
+                name="fbc_view_btn"
+                tool_tip="View/sort options"
+                top_delta="0"
+                width="31" />
+                <button
+                    follows="right"
+                    height="25"
+                    image_hover_unselected="Toolbar_Middle_Over"
+                    image_overlay="AddItem_Off"
+                    image_selected="Toolbar_Middle_Selected"
+                    image_unselected="Toolbar_Middle_Off"
+                    layout="topleft"
+                    left_pad="2"
+                    name="fbc_add_btn"
+                    tool_tip="Offer friendship to a resident"
+                    top_delta="0"
+                    width="31">
+                    <commit_callback
+                    function="People.AddFriendWizard" />
+                </button>
+                <dnd_button
+                    follows="right"
+                    height="25"
+                    image_hover_unselected="Toolbar_Middle_Over"
+                    image_overlay="TrashItem_Off"
+                    image_selected="Toolbar_Middle_Selected"
+                    image_unselected="Toolbar_Middle_Off"
+                    left_pad="2"
+                    layout="topleft"
+                    name="fbc_del_btn"
+                    tool_tip="Remove selected person as a friend"
+                    top_delta="0"
+                    width="31">
+                    <commit_callback
+                    function="People.DelFriend" />
+                </dnd_button>
+            </panel>
+        </panel>
     </tab_container>
 </panel>