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

Use pre-chui LLParticipantList (in fsparticipantlist.*)

master
Cinders 2013-06-28 21:17:28 -06:00
parent deff7b452b
commit b49d94e934
9 changed files with 1381 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@ -159,6 +159,7 @@ set(viewer_SOURCE_FILES
fspanelprofile.cpp
fspanelprofileclassifieds.cpp
fspanelradar.cpp
fsparticipantlist.cpp
fspose.cpp
fsradar.cpp
fsradarentry.cpp
@ -841,6 +842,7 @@ set(viewer_HEADER_FILES
fspanelprofile.h
fspanelprofileclassifieds.h
fspanelradar.h
fsparticipantlist.h
fspose.h
fsradar.h
fsradarentry.h

2
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -43,7 +43,7 @@
#include "fsfloaterim.h"
#include "llimview.h"
#include "llfloaterreg.h"
#include "llparticipantlist.h"
#include "fsparticipantlist.h"
#include "llspeakers.h"
#include "lltextutil.h"
#include "lltransientfloatermgr.h"

2
indra/newview/fspanelimcontrolpanel.cpp
View File

@ -39,7 +39,7 @@
#include "llbutton.h"
#include "llgroupactions.h"
#include "llavatarlist.h"
#include "llparticipantlist.h"
#include "fsparticipantlist.h"
#include "llimview.h"
#include "llvoicechannel.h"
#include "llspeakers.h"

1062
indra/newview/fsparticipantlist.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

288
indra/newview/fsparticipantlist.h Normal file
View File

@ -0,0 +1,288 @@
/**
* @file fsparticipantlist.h
* @brief LLParticipantList intended to update view(LLAvatarList) according to incoming messages
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_PARTICIPANTLIST_H
#define LL_PARTICIPANTLIST_H
#include "llviewerprecompiledheaders.h"
#include "llevent.h"
#include "llavatarlist.h" // for LLAvatarItemRecentSpeakerComparator
#include "lllistcontextmenu.h"
class LLSpeakerMgr;
class LLAvatarList;
class LLUICtrl;
class LLAvalineUpdater;
class LLParticipantList
{
LOG_CLASS(LLParticipantList);
public:
typedef boost::function<bool (const LLUUID& speaker_id)> validate_speaker_callback_t;
LLParticipantList(LLSpeakerMgr* data_source,
LLAvatarList* avatar_list,
bool use_context_menu = true,
bool exclude_agent = true,
bool can_toggle_icons = true);
~LLParticipantList();
void setSpeakingIndicatorsVisible(BOOL visible);
enum EParticipantSortOrder
{
E_SORT_BY_NAME = 0,
E_SORT_BY_RECENT_SPEAKERS = 1,
};
/**
* Adds specified avatar ID to the existing list if it is not Agent's ID
*
* @param[in] avatar_id - Avatar UUID to be added into the list
*/
void addAvatarIDExceptAgent(const LLUUID& avatar_id);
/**
* Set and sort Avatarlist by given order
*/
void setSortOrder(EParticipantSortOrder order = E_SORT_BY_NAME);
const EParticipantSortOrder getSortOrder() const;
/**
* Refreshes the participant list.
*/
void update();
/**
* Set a callback to be called before adding a speaker. Invalid speakers will not be added.
*
* If the callback is unset all speakers are considered as valid.
*
* @see onAddItemEvent()
*/
void setValidateSpeakerCallback(validate_speaker_callback_t cb);
protected:
/**
* LLSpeakerMgr event handlers
*/
bool onAddItemEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
bool onRemoveItemEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
bool onClearListEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
bool onModeratorUpdateEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
bool onSpeakerMuteEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
/**
* Sorts the Avatarlist by stored order
*/
void sort();
/**
* List of listeners implementing LLOldEvents::LLSimpleListener.
* There is no way to handle all the events in one listener as LLSpeakerMgr registers
* listeners in such a way that one listener can handle only one type of event
**/
class BaseSpeakerListener : public LLOldEvents::LLSimpleListener
{
public:
BaseSpeakerListener(LLParticipantList& parent) : mParent(parent) {}
protected:
LLParticipantList& mParent;
};
class SpeakerAddListener : public BaseSpeakerListener
{
public:
SpeakerAddListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {}
/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
};
class SpeakerRemoveListener : public BaseSpeakerListener
{
public:
SpeakerRemoveListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {}
/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
};
class SpeakerClearListener : public BaseSpeakerListener
{
public:
SpeakerClearListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {}
/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
};
class SpeakerModeratorUpdateListener : public BaseSpeakerListener
{
public:
SpeakerModeratorUpdateListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {}
/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
};
class SpeakerMuteListener : public BaseSpeakerListener
{
public:
SpeakerMuteListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {}
/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
};
/**
* Menu used in the participant list.
*/
class LLParticipantListMenu : public LLListContextMenu
{
public:
LLParticipantListMenu(LLParticipantList& parent):mParent(parent){};
/*virtual*/ LLContextMenu* createMenu();
/*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y);
protected:
LLParticipantList& mParent;
private:
bool enableContextMenuItem(const LLSD& userdata);
bool enableModerateContextMenuItem(const LLSD& userdata);
bool checkContextMenuItem(const LLSD& userdata);
void sortParticipantList(const LLSD& userdata);
void toggleAllowTextChat(const LLSD& userdata);
void toggleMute(const LLSD& userdata, U32 flags);
void toggleMuteText(const LLSD& userdata);
void toggleMuteVoice(const LLSD& userdata);
/**
* Return true if Agent is group moderator(and moderator of group call).
*/
bool isGroupModerator();
// Voice moderation support
/**
* Check whether specified by argument avatar is muted for group chat or not.
*/
bool isMuted(const LLUUID& avatar_id);
/**
* Processes Voice moderation menu items.
*
* It calls either moderateVoiceParticipant() or moderateVoiceParticipant() depend on
* passed parameter.
*
* @param userdata can be "selected" or "others".
*
* @see moderateVoiceParticipant()
* @see moderateVoiceAllParticipants()
*/
void moderateVoice(const LLSD& userdata);
/**
* Mutes/Unmutes avatar for current group voice chat.
*
* It only marks avatar as muted for session and does not use local Agent's Block list.
* It does not mute Agent itself.
*
* @param[in] avatar_id UUID of avatar to be processed
* @param[in] unmute if true - specified avatar will be muted, otherwise - unmuted.
*
* @see moderateVoiceAllParticipants()
*/
void moderateVoiceParticipant(const LLUUID& avatar_id, bool unmute);
/**
* Mutes/Unmutes all avatars for current group voice chat.
*
* It only marks avatars as muted for session and does not use local Agent's Block list.
*
* @param[in] unmute if true - avatars will be muted, otherwise - unmuted.
*
* @see moderateVoiceParticipant()
*/
void moderateVoiceAllParticipants(bool unmute);
static void confirmMuteAllCallback(const LLSD& notification, const LLSD& response);
};
/**
* Comparator for comparing avatar items by last spoken time
*/
class LLAvatarItemRecentSpeakerComparator : public LLAvatarItemNameComparator, public LLRefCount
{
LOG_CLASS(LLAvatarItemRecentSpeakerComparator);
public:
LLAvatarItemRecentSpeakerComparator(LLParticipantList& parent):mParent(parent){};
virtual ~LLAvatarItemRecentSpeakerComparator() {};
protected:
virtual bool doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const;
private:
LLParticipantList& mParent;
};
private:
void onAvatarListDoubleClicked(LLUICtrl* ctrl);
void onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param);
void onAvalineCallerFound(const LLUUID& participant_id);
void onAvalineCallerRemoved(const LLUUID& participant_id);
/**
* Adjusts passed participant to work properly.
*
* Adds SpeakerMuteListener to process moderation actions.
*/
void adjustParticipant(const LLUUID& speaker_id);
bool isHovered();
LLSpeakerMgr* mSpeakerMgr;
LLAvatarList* mAvatarList;
std::set<LLUUID> mModeratorList;
std::set<LLUUID> mModeratorToRemoveList;
LLPointer<SpeakerAddListener> mSpeakerAddListener;
LLPointer<SpeakerRemoveListener> mSpeakerRemoveListener;
LLPointer<SpeakerClearListener> mSpeakerClearListener;
LLPointer<SpeakerModeratorUpdateListener> mSpeakerModeratorListener;
LLPointer<SpeakerMuteListener> mSpeakerMuteListener;
LLParticipantListMenu* mParticipantListMenu;
/**
* This field manages an adding a new avatar_id in the mAvatarList
* If true, then agent_id wont be added into mAvatarList
* Also by default this field is controlling a sort procedure, @c sort()
*/
bool mExcludeAgent;
// boost::connections
boost::signals2::connection mAvatarListDoubleClickConnection;
boost::signals2::connection mAvatarListRefreshConnection;
boost::signals2::connection mAvatarListReturnConnection;
boost::signals2::connection mAvatarListToggleIconsConnection;
LLPointer<LLAvatarItemRecentSpeakerComparator> mSortByRecentSpeakers;
validate_speaker_callback_t mValidateSpeakerCallback;
LLAvalineUpdater* mAvalineUpdater;
};
#endif // LL_PARTICIPANTLIST_H

14
indra/newview/llimview.h
View File

@ -194,6 +194,14 @@ public:
*/
bool clearSession(const LLUUID& session_id);
// <FS:CR> Make public for FS Communications UI
/**
* Populate supplied std::list with messages starting from index specified by start_index without
* emitting no unread messages signal.
*/
void getMessagesSilently(const LLUUID& session_id, std::list<LLSD>& messages, int start_index = 0);
// </FS:CR>
/**
* Sends no unread messages signal.
*/
@ -293,12 +301,14 @@ public:
private:
// <FS:CR> Post CHUI - Move this public for FS Communications UI
/**
* Populate supplied std::list with messages starting from index specified by start_index without
* emitting no unread messages signal.
*/
void getMessagesSilently(const LLUUID& session_id, std::list<LLSD>& messages, int start_index = 0);
//void getMessagesSilently(const LLUUID& session_id, std::list<LLSD>& messages, int start_index = 0);
// </FS:CR>
/**
* Add message to a list of message associated with session specified by session_id
*/

9
indra/newview/lloutputmonitorctrl.h
View File

@ -28,10 +28,10 @@
#define LL_LLOUTPUTMONITORCTRL_H
#include "v4color.h"
#include "../llui/llview.h"
#include "llview.h"
#include "llmutelist.h"
#include "llspeakingindicatormanager.h"
//#include "../llui/lluiimage.h"
//#include "lluiimage.h"
class LLTextBox;
class LLUICtrlFactory;
@ -73,6 +73,11 @@ public:
void setPower(F32 val);
F32 getPower(F32 val) const { return mPower; }
// <FS:CR> FS Communications UI
bool getIsMuted() const { return mIsMuted; }
void setIsMuted(bool val) { mIsMuted = val; }
// </FS:CR>
// For the current user, need to know the PTT state to show
// correct button image.
void setIsAgentControl(bool val) { mIsAgentControl = val; }

4
indra/newview/llparticipantlist.cpp
View File

@ -24,6 +24,8 @@
* $/LicenseInfo$
*/
#if 0
#include "llviewerprecompiledheaders.h"
#include "llavatarnamecache.h"
@ -470,4 +472,6 @@ bool LLParticipantList::SpeakerMuteListener::handleEvent(LLPointer<LLOldEvents::
return mParent.onSpeakerMuteEvent(event, userdata);
}
#endif // 0
//EOF

4
indra/newview/llparticipantlist.h
View File

@ -24,6 +24,8 @@
* $/LicenseInfo$
*/
#if 0
#ifndef LL_PARTICIPANTLIST_H
#define LL_PARTICIPANTLIST_H
@ -159,4 +161,6 @@ private:
LLAvalineUpdater* mAvalineUpdater;
};
#endif // 0
#endif // LL_PARTICIPANTLIST_H