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

EXP-137 : Comments cleanup

meow-7.2.2
Merov Linden 2012-06-13 13:52:26 -07:00
parent 0e2f5c2eba
commit b01ab3b9b2
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llimfloatercontainer.cpp
View File

@ -116,7 +116,7 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
LLUUID session_id = floaterp->getKey();
// CHUI-137
// CHUI-137 : Temporary implementation of conversations list
// Create a conversation item
LLConversationItem* item = new LLConversationItem(floaterp->getTitle(),session_id, floaterp, this);
mConversationsItems[session_id] = item;
@ -171,11 +171,12 @@ void LLIMFloaterContainer::removeFloater(LLFloater* floaterp)
{
LLMultiFloater::removeFloater(floaterp);
// CHUI-137 : Clean up the conversations list
// CHUI-137 : Temporary implementation of conversations list
// Clean up the conversations list
LLUUID session_id = floaterp->getKey();
// Delete the widget and the associated conversation item
// Note : since the mConversationsItems is a listener to the widget, deleting the widget also
// delete its listener
// Note : since the mConversationsItems is also the listener to the widget, deleting
// the widget will also delete its listener
conversations_widgets_map::iterator widget_it = mConversationsWidgets.find(session_id);
if (widget_it != mConversationsWidgets.end())
{
@ -197,7 +198,7 @@ void LLIMFloaterContainer::removeFloater(LLFloater* floaterp)
panel_rect.getWidth(),
panel_rect.getHeight() - item_height*(index+1)));
}
// CHUI-137
// CHUI-137 : end
LLRect contents_rect = floaterp->getRect();
@ -362,7 +363,7 @@ void LLIMFloaterContainer::updateState(bool collapse, S32 delta_width)
setCanMinimize(is_left_pane_expanded || is_right_pane_expanded);
}
// CHUI-137 : Temp implementation of conversations list
// CHUI-137 : Temporary implementation of conversations list
LLFolderViewItem* LLIMFloaterContainer::createConversationItemWidget(LLConversationItem* item)
{
LLFolderViewItem::Params params;
@ -370,7 +371,6 @@ LLFolderViewItem* LLIMFloaterContainer::createConversationItemWidget(LLConversat
params.name = item->getDisplayName();
//params.icon = bridge->getIcon();
//params.icon_open = bridge->getOpenIcon();
//params.creation_date = bridge->getCreationDate();
//params.root = mFolderRoot;
params.listener = item;
@ -387,7 +387,8 @@ LLConversationItem::LLConversationItem(std::string name, const LLUUID& uuid, LLF
mFloater(floaterp),
mContainer(containerp)
{
// Hack: the nearby chat has no name so we catch that and impose one
// Hack: the nearby chat has no name so we catch that case and impose one
// Of course, we won't be doing this in the final code
if (name == "")
mName = "Nearby Chat";
}
@ -395,7 +396,7 @@ LLConversationItem::LLConversationItem(std::string name, const LLUUID& uuid, LLF
// Virtual action callbacks
void LLConversationItem::selectItem(void)
{
// Select the conversation floater that is being selected
// Switch to the conversation floater that is being selected
mContainer->selectFloater(mFloater);
}

23
indra/newview/llimfloatercontainer.h
View File

@ -42,16 +42,16 @@ class LLButton;
class LLLayoutPanel;
class LLLayoutStack;
class LLTabContainer;
class LLIMFloaterContainer;
// CHUI-137 : Temporary implementation of conversations list
class LLConversationItem;
class LLIMFloaterContainer;
typedef std::map<LLUUID, LLConversationItem*> conversations_items_map;
typedef std::map<LLUUID, LLFolderViewItem*> conversations_widgets_map;
// Conversation items: we hold a list of those and create an LLFolderViewItem widget for each that we tuck
// into the mConversationsListPanel.
// Conversation items: we hold a list of those and create an LLFolderViewItem widget for each
// that we tuck into the mConversationsListPanel.
class LLConversationItem : public LLFolderViewEventListener
{
public:
@ -89,7 +89,7 @@ public:
virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; }
virtual LLWearableType::EType getWearableType() const { return LLWearableType::WT_NONE; }
// The action callbacks (or so we think...)
// The action callbacks
virtual void performAction(LLInventoryModel* model, std::string action);
virtual void openItem( void );
virtual void closeItem( void );
@ -97,14 +97,14 @@ public:
virtual void selectItem(void);
virtual void showProperties(void);
// This method should be called when a drag begins. returns TRUE
// if the drag can begin, otherwise FALSE.
// This method should be called when a drag begins.
// Returns TRUE if the drag can begin, FALSE otherwise.
virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const { return FALSE; }
// This method will be called to determine if a drop can be
// performed, and will set drop to TRUE if a drop is
// requested. Returns TRUE if a drop is possible/happened,
// otherwise FALSE.
// requested.
// Returns TRUE if a drop is possible/happened, FALSE otherwise.
virtual BOOL dragOrDrop(MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
@ -115,7 +115,7 @@ private:
LLFloater* mFloater;
LLIMFloaterContainer* mContainer;
};
// CHUI-137 : End
// CHUI-137 : End
class LLIMFloaterContainer : public LLMultiFloater
{
@ -164,8 +164,9 @@ private:
LLLayoutPanel* mConversationsPane;
LLLayoutStack* mConversationsStack;
// CHUI-137 : Data
LLPanel* mConversationsListPanel; // The widget we add list item to (title of each conversation)
// CHUI-137 : Temporary implementation of conversations list
// Conversation list data
LLPanel* mConversationsListPanel; // This is the widget we add items to (i.e. clickable title for each conversation)
conversations_items_map mConversationsItems;
conversations_widgets_map mConversationsWidgets;
};