[XP Tools] Initial merge Cherry Pick Also modernize llfloaterauction internally, but leave the ui the same for now. Breaks out script_question_mute() in llviewermessage.cpp to better sync with upstream Adds support for UnknownScriptQuestion notification (translators need to translate this one~) RLVa note: Rewrote RLVa permissions handling block just a bit. Added 13 new capabilities from the XP Tools, I doubt all of them really exist. Minor update to LLComboBox, decided against implementing LLIconsComboBox for now. Modified LLExperienceLog::notify to lookup names and display them along with the slurls since our editors don't do that automatically. Experience tweak: Changed a few notify's to notifytips so that we can click the links to experience profiles from chat instead of via hacked in buttons Migrated LLFloaterCompileQueue to a proper Instance Tracker so we can call getKey Modernized LLSD, gives us reverse iterators and the new debugging impl. We needed the reverse iterators. Experience tweak: Added virtual destructors to responders. Updated llhandle.h to allow calling getDerivedHandle in public. Updated LLScrollContainer and LLScrollBar to be more modern. Added LLFlatListView/flat_list_view from upstream - these don't seem work though? Added some newer login/logout strings to strings.xml Thanks for the default timeout policies, Aleric~ To avoid needing to scroll through tabs, about land tabs now are as big as they need to be to display their labels, same on groups Group Members and Roles has been renamed to just Members because this allows the new Experiences tab enough room to display. Thanks to Henri Beauchamp (Cool VL Viewer) for the setupList augmentation. (without it, I'd still be stuck) Thanks to Shyotl for the helpsies~ Added the LSL constants, events, and functions that LL neglected to put in. Added click callbacks and name lookups for profile linky texts~ Merge is up to 22b4cdc Old TODO: Get the uis looking nice (profiles? Experiences... floater) - done Old TODO: Make sure flatlistviews look okay... - Not using Old TODO: Fix LLFloaterExperiencePicker, right now the panel does not show. - unsure Old TODO: Remove the llfloaterabout.cpp change. - done Merges llexperiencecache with upstream and unstable Introduces LLCoroResponder, TODO: Make everything use this. Updates Reporter floater to the latest, supports the new cap thingy Also adds these commits/changes: [XPTools] Double clicking experiences in namelists should open the profile Add List.CopyNames support for Experiences [XP Tools] Some UI work, I'll do more later [XPTools] More UI Stuff, Later is now! Allow getSLURL for experiences WIP Experience list menu Also make EXPERIENCE > OBJECT, because mainline started OBJECT already [XPTools] Add Experience support to Name UI [XPTools] Fix experience profile UI 9c3067e843265587e91c659200a8d783acf2d9b2 [XPTools] Fix experience location showing "last" and getting set to "last" [XPTools] Move Experiences floater from view menu to world menu [XPTools] Fix up more UI [XPTools] Fix experiences panels [XPTools] Hide pieces of the Experiences menu when they're not usable [XPTools] More UI work, mostly to get the menus working [XPTools] The events list is for events, not experiences, remove menu # Conflicts: # indra/llcommon/llsd.cpp - merge with unstable branch # indra/llmessage/message_prehash.cpp # indra/llmessage/message_prehash.h # indra/llui/llscrollbar.cpp # indra/llui/llscrollcontainer.cpp # indra/llui/llurlentry.cpp # indra/llui/llurlregistry.cpp # indra/newview/app_settings/keywords.ini # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/llassetuploadresponders.cpp # indra/newview/llcompilequeue.* - merge stable # indra/newview/llfloaterabout.cpp # indra/newview/llfloaterland.* - merge unstable # indra/newview/llfloaterproperties.cpp # indra/newview/llfloaterregioninfo.* - merge unstable # indra/newview/llmenucommands.cpp - merge unstable # indra/newview/llpreviewscript.cpp - merge unstable # indra/newview/llviewermessage.cpp - merge unstable # indra/newview/llviewerregion.cpp - merge unstable # indra/newview/skins/default/textures/textures.xml - merge unstable # indra/newview/skins/default/xui/en-us/strings.xml - merge unstable
183 lines
5.9 KiB
C++
183 lines
5.9 KiB
C++
/**
|
|
* @file llnamelistctrl.h
|
|
* @brief A list of names, automatically refreshing from the name cache.
|
|
*
|
|
* $LicenseInfo:firstyear=2003&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_LLNAMELISTCTRL_H
|
|
#define LL_LLNAMELISTCTRL_H
|
|
|
|
#include <set>
|
|
|
|
#include "llscrolllistctrl.h"
|
|
|
|
class LLAvatarName;
|
|
|
|
/**
|
|
* LLNameListCtrl item
|
|
*
|
|
* We don't use LLScrollListItem to be able to override getUUID(), which is needed
|
|
* because the name list item value is not simply an UUID but a map (uuid, is_group).
|
|
*/
|
|
class LLNameListItem final : public LLScrollListItem, public LLHandleProvider<LLNameListItem>
|
|
{
|
|
public:
|
|
enum ENameType
|
|
{
|
|
INDIVIDUAL,
|
|
GROUP,
|
|
SPECIAL,
|
|
EXPERIENCE
|
|
};
|
|
|
|
// provide names for enums
|
|
struct NameTypeNames : public LLInitParam::TypeValuesHelper<ENameType, NameTypeNames>
|
|
{
|
|
static void declareValues();
|
|
};
|
|
|
|
struct Params : public LLInitParam::Block<Params, LLScrollListItem::Params>
|
|
{
|
|
Optional<std::string> name;
|
|
Optional<ENameType, NameTypeNames> target;
|
|
|
|
Params()
|
|
: name("name"),
|
|
target("target", INDIVIDUAL)
|
|
{}
|
|
};
|
|
ENameType getNameType() const { return mNameType; }
|
|
void setNameType(ENameType name_type) { mNameType = name_type; }
|
|
|
|
protected:
|
|
friend class LLNameListCtrl;
|
|
|
|
LLNameListItem( const Params& p )
|
|
: LLScrollListItem(p), mNameType(p.target)
|
|
{
|
|
}
|
|
|
|
LLNameListItem( const LLScrollListItem::Params& p, ENameType name_type)
|
|
: LLScrollListItem(p), mNameType(name_type)
|
|
{
|
|
}
|
|
|
|
private:
|
|
ENameType mNameType;
|
|
};
|
|
|
|
|
|
class LLNameListCtrl final
|
|
: public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
|
|
{
|
|
public:
|
|
typedef boost::signals2::signal<void(bool)> namelist_complete_signal_t;
|
|
typedef LLNameListItem::Params NameItem;
|
|
|
|
struct NameColumn : public LLInitParam::ChoiceBlock<NameColumn>
|
|
{
|
|
Alternative<S32> column_index;
|
|
Alternative<std::string> column_name;
|
|
NameColumn()
|
|
: column_index("name_column_index", 0),
|
|
column_name("name_column")
|
|
{}
|
|
};
|
|
|
|
protected:
|
|
LLNameListCtrl(const std::string& name, const LLRect& rect, BOOL allow_multiple_selection, BOOL draw_border = TRUE, bool draw_heading = false, S32 name_column_index = 0, const std::string& name_system = "PhoenixNameSystem", const std::string& tooltip = LLStringUtil::null);
|
|
virtual ~LLNameListCtrl()
|
|
{
|
|
for (avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.begin(); it != mAvatarNameCacheConnections.end(); ++it)
|
|
{
|
|
if (it->second.connected())
|
|
{
|
|
it->second.disconnect();
|
|
}
|
|
}
|
|
mAvatarNameCacheConnections.clear();
|
|
}
|
|
friend class LLUICtrlFactory;
|
|
public:
|
|
virtual LLXMLNodePtr getXML(bool save_children = true) const override;
|
|
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
|
|
|
|
// Add a user to the list by name. It will be added, the name
|
|
// requested from the cache, and updated as necessary.
|
|
LLScrollListItem* addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
|
|
BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null, const std::string& prefix = LLStringUtil::null);
|
|
LLScrollListItem* addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
|
|
|
|
/*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL) override;
|
|
LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, const std::string& suffix = LLStringUtil::null,
|
|
const std::string& prefix = LLStringUtil::null);
|
|
|
|
// Add a user to the list by name. It will be added, the name
|
|
// requested from the cache, and updated as necessary.
|
|
void addGroupNameItem(const LLUUID& group_id, EAddPosition pos = ADD_BOTTOM,
|
|
BOOL enabled = TRUE);
|
|
void addGroupNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
|
|
|
|
|
|
void removeNameItem(const LLUUID& agent_id);
|
|
|
|
LLScrollListItem* getNameItemByAgentId(const LLUUID& agent_id);
|
|
|
|
// LLView interface
|
|
/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
|
|
BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
|
|
EAcceptance *accept,
|
|
std::string& tooltip_msg) override;
|
|
BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override;
|
|
|
|
Type getSelectedType() const override final;
|
|
|
|
void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
|
|
|
|
void sortByName(BOOL ascending);
|
|
private:
|
|
void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, std::string prefix, LLHandle<LLNameListItem> item);
|
|
void onGroupNameCache(const LLUUID& group_id, const std::string name, LLHandle<LLNameListItem> item);
|
|
|
|
private:
|
|
S32 mNameColumnIndex;
|
|
//std::string mNameColumn;
|
|
BOOL mAllowCallingCardDrop;
|
|
const LLCachedControl<S32> mNameSystem; // Singu Note: Instead of mShortNames
|
|
typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t;
|
|
avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
|
|
|
|
S32 mPendingLookupsRemaining;
|
|
namelist_complete_signal_t mNameListCompleteSignal;
|
|
|
|
public:
|
|
boost::signals2::connection setOnNameListCompleteCallback(std::function<void(bool)> onNameListCompleteCallback)
|
|
{
|
|
return mNameListCompleteSignal.connect(onNameListCompleteCallback);
|
|
}
|
|
|
|
};
|
|
|
|
|
|
#endif
|