Revert FSFloaterIMContainer to Firestorm code and dump new CHUI stuff that got in during merge
Ansariel
parent
9094968df5
commit
7ed4535803
File diff suppressed because it is too large
Load Diff
|
|
@ -25,8 +25,7 @@
|
|||
*/
|
||||
|
||||
// Original file: llimfloatercontainer.h
|
||||
// <FS:TM> CHUI Merge below was from anserial's refactoring, seems based on old code
|
||||
#if 0
|
||||
|
||||
|
||||
#ifndef FS_FLOATERIMCONTAINER_H
|
||||
#define FS_FLOATERIMCONTAINER_H
|
||||
|
|
@ -54,6 +53,9 @@ public:
|
|||
/*virtual*/ void addFloater(LLFloater* floaterp,
|
||||
BOOL select_added_floater,
|
||||
LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
|
||||
// [SL:KB] - Patch: Chat-NearbyChatBar | Checked: 2011-12-11 (Catznip-3.2.0d) | Added: Catznip-3.2.0d
|
||||
/*virtual*/ void removeFloater(LLFloater* floaterp);
|
||||
// [/SL:KB]
|
||||
|
||||
static LLFloater* getCurrentVoiceFloater();
|
||||
|
||||
|
|
@ -72,192 +74,3 @@ private:
|
|||
};
|
||||
|
||||
#endif // FS_FLOATERIMCONTAINER_H
|
||||
#endif
|
||||
|
||||
// <FS:TM> CHUI Merge below is modified from LL's llfloaterimcontainer.h
|
||||
|
||||
#ifndef FS_FLOATERIMCONTAINER_H
|
||||
#define FS_FLOATERIMCONTAINER_H
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
#include "llimview.h"
|
||||
#include "llevents.h"
|
||||
#include "../llui/llfloater.h"
|
||||
#include "../llui/llmultifloater.h"
|
||||
#include "llavatarpropertiesprocessor.h"
|
||||
#include "llgroupmgr.h"
|
||||
#include "../llui/lltrans.h"
|
||||
#include "llconversationmodel.h"
|
||||
#include "llconversationview.h"
|
||||
|
||||
class LLButton;
|
||||
class LLLayoutPanel;
|
||||
class LLLayoutStack;
|
||||
class LLTabContainer;
|
||||
class FSFloaterIMContainer;
|
||||
class LLSpeaker;
|
||||
class LLSpeakerMgr;
|
||||
|
||||
class FSFloaterIMContainer
|
||||
: public LLMultiFloater
|
||||
, public LLIMSessionObserver
|
||||
{
|
||||
public:
|
||||
FSFloaterIMContainer(const LLSD& seed, const Params& params = getDefaultParams());
|
||||
virtual ~FSFloaterIMContainer();
|
||||
|
||||
/*virtual*/ BOOL postBuild();
|
||||
/*virtual*/ void onOpen(const LLSD& key);
|
||||
/*virtual*/ void draw();
|
||||
/*virtual*/ void setMinimized(BOOL b);
|
||||
/*virtual*/ void setVisible(BOOL visible);
|
||||
/*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD());
|
||||
/*virtual*/ void updateResizeLimits();
|
||||
void onCloseFloater(LLUUID& id);
|
||||
|
||||
/*virtual*/ void addFloater(LLFloater* floaterp,
|
||||
BOOL select_added_floater,
|
||||
LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
|
||||
void returnFloaterToHost();
|
||||
void showConversation(const LLUUID& session_id);
|
||||
void selectConversation(const LLUUID& session_id);
|
||||
void selectNextConversationByID(const LLUUID& session_id);
|
||||
BOOL selectConversationPair(const LLUUID& session_id, bool select_widget, bool focus_floater = true);
|
||||
void clearAllFlashStates();
|
||||
bool selectAdjacentConversation(bool focus_selected);
|
||||
bool selectNextorPreviousConversation(bool select_next, bool focus_selected = true);
|
||||
void expandConversation();
|
||||
|
||||
/*virtual*/ void tabClose();
|
||||
void showStub(bool visible);
|
||||
|
||||
static LLFloater* getCurrentVoiceFloater();
|
||||
static FSFloaterIMContainer* findInstance();
|
||||
static FSFloaterIMContainer* getInstance();
|
||||
|
||||
static void onCurrentChannelChanged(const LLUUID& session_id);
|
||||
|
||||
void collapseMessagesPane(bool collapse);
|
||||
|
||||
// Callbacks
|
||||
static void idle(void* user_data);
|
||||
|
||||
// LLIMSessionObserver observe triggers
|
||||
/*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg);
|
||||
/*virtual*/ void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id);
|
||||
/*virtual*/ void sessionVoiceOrIMStarted(const LLUUID& session_id);
|
||||
/*virtual*/ void sessionRemoved(const LLUUID& session_id);
|
||||
/*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
|
||||
|
||||
LLConversationViewModel& getRootViewModel() { return mConversationViewModel; }
|
||||
LLUUID getSelectedSession() { return mSelectedSession; }
|
||||
void setSelectedSession(LLUUID sessionID) { mSelectedSession = sessionID; }
|
||||
LLConversationItem* getSessionModel(const LLUUID& session_id) { return get_ptr_in_map(mConversationsItems,session_id); }
|
||||
LLConversationSort& getSortOrder() { return mConversationViewModel.getSorter(); }
|
||||
|
||||
void onNearbyChatClosed();
|
||||
|
||||
// Handling of lists of participants is public so to be common with llfloatersessiontab
|
||||
// *TODO : Find a better place for this.
|
||||
bool checkContextMenuItem(const std::string& item, uuid_vec_t& selectedIDS);
|
||||
bool enableContextMenuItem(const std::string& item, uuid_vec_t& selectedIDS);
|
||||
void doToParticipants(const std::string& item, uuid_vec_t& selectedIDS);
|
||||
|
||||
void assignResizeLimits();
|
||||
virtual BOOL handleKeyHere(KEY key, MASK mask );
|
||||
/*virtual*/ void closeFloater(bool app_quitting = false);
|
||||
|
||||
private:
|
||||
typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t;
|
||||
avatarID_panel_map_t mSessions;
|
||||
boost::signals2::connection mNewMessageConnection;
|
||||
|
||||
/*virtual*/ void computeResizeLimits(S32& new_min_width, S32& new_min_height) {}
|
||||
|
||||
void onNewMessageReceived(const LLSD& data);
|
||||
|
||||
void onExpandCollapseButtonClicked();
|
||||
void onStubCollapseButtonClicked();
|
||||
void processParticipantsStyleUpdate();
|
||||
void onSpeakButtonClicked();
|
||||
|
||||
void collapseConversationsPane(bool collapse, bool save_is_allowed=true);
|
||||
|
||||
void reshapeFloaterAndSetResizeLimits(bool collapse, S32 delta_width);
|
||||
|
||||
void onAddButtonClicked();
|
||||
void onAvatarPicked(const uuid_vec_t& ids);
|
||||
|
||||
BOOL isActionChecked(const LLSD& userdata);
|
||||
void onCustomAction (const LLSD& userdata);
|
||||
void setSortOrderSessions(const LLConversationFilter::ESortOrderType order);
|
||||
void setSortOrderParticipants(const LLConversationFilter::ESortOrderType order);
|
||||
void setSortOrder(const LLConversationSort& order);
|
||||
|
||||
void getSelectedUUIDs(uuid_vec_t& selected_uuids);
|
||||
const LLConversationItem * getCurSelectedViewModelItem();
|
||||
void getParticipantUUIDs(uuid_vec_t& selected_uuids);
|
||||
void doToSelected(const LLSD& userdata);
|
||||
bool checkContextMenuItem(const LLSD& userdata);
|
||||
bool enableContextMenuItem(const LLSD& userdata);
|
||||
bool visibleContextMenuItem(const LLSD& userdata);
|
||||
void doToSelectedConversation(const std::string& command, uuid_vec_t& selectedIDS);
|
||||
void doToSelectedGroup(const LLSD& userdata);
|
||||
|
||||
static void confirmMuteAllCallback(const LLSD& notification, const LLSD& response);
|
||||
bool enableModerateContextMenuItem(const std::string& userdata);
|
||||
LLSpeaker * getSpeakerOfSelectedParticipant(LLSpeakerMgr * speaker_managerp);
|
||||
LLSpeakerMgr * getSpeakerMgrForSelectedParticipant();
|
||||
bool isGroupModerator();
|
||||
bool isMuted(const LLUUID& avatar_id);
|
||||
void moderateVoice(const std::string& command, const LLUUID& userID);
|
||||
void moderateVoiceAllParticipants(bool unmute);
|
||||
void moderateVoiceParticipant(const LLUUID& avatar_id, bool unmute);
|
||||
void toggleAllowTextChat(const LLUUID& participant_uuid);
|
||||
void toggleMute(const LLUUID& participant_id, U32 flags);
|
||||
void openNearbyChat();
|
||||
|
||||
LLButton* mExpandCollapseBtn;
|
||||
LLButton* mStubCollapseBtn;
|
||||
LLPanel* mStubPanel;
|
||||
LLTextBox* mStubTextBox;
|
||||
LLLayoutPanel* mMessagesPane;
|
||||
LLLayoutPanel* mConversationsPane;
|
||||
LLLayoutStack* mConversationsStack;
|
||||
|
||||
bool mInitialized;
|
||||
|
||||
LLUUID mSelectedSession;
|
||||
std::string mGeneralTitle;
|
||||
|
||||
// Conversation list implementation
|
||||
public:
|
||||
bool removeConversationListItem(const LLUUID& uuid, bool change_focus = true);
|
||||
LLConversationItem* addConversationListItem(const LLUUID& uuid, bool isWidgetSelected = false);
|
||||
void setTimeNow(const LLUUID& session_id, const LLUUID& participant_id);
|
||||
void setNearbyDistances();
|
||||
void reSelectConversation();
|
||||
void updateSpeakBtnState();
|
||||
static bool isConversationLoggingAllowed();
|
||||
void flashConversationItemWidget(const LLUUID& session_id, bool is_flashes);
|
||||
bool isScrolledOutOfSight(LLConversationViewSession* conversation_item_widget);
|
||||
boost::signals2::connection mMicroChangedSignal;
|
||||
S32 getConversationListItemSize() { return mConversationsWidgets.size(); }
|
||||
|
||||
private:
|
||||
LLConversationViewSession* createConversationItemWidget(LLConversationItem* item);
|
||||
LLConversationViewParticipant* createConversationViewParticipant(LLConversationItem* item);
|
||||
bool onConversationModelEvent(const LLSD& event);
|
||||
|
||||
// Conversation list data
|
||||
LLPanel* mConversationsListPanel; // This is the main widget we add conversation widget to
|
||||
conversations_items_map mConversationsItems;
|
||||
conversations_widgets_map mConversationsWidgets;
|
||||
LLConversationViewModel mConversationViewModel;
|
||||
LLFolderView* mConversationsRoot;
|
||||
LLEventStream mConversationsEventStream;
|
||||
};
|
||||
|
||||
#endif // FS_FLOATERIMCONTAINER_H
|
||||
Loading…
Reference in New Issue