svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134

1 files changed, 68 insertions, 41 deletions

diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index a98a411efa..001e10184b 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -59,14 +59,16 @@ public:
 	virtual ~LLScrollListCell() {};
 	virtual void			drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const = 0;		// truncate to given width, if possible
 	virtual S32				getWidth() const = 0;
+	virtual S32				getContentWidth() const { return 0; }
 	virtual S32				getHeight() const = 0;
-	virtual const LLString&	getText() const { return LLString::null; }
-	virtual const LLString&	getTextLower() const { return LLString::null; }
+	virtual const LLSD		getValue() const { return LLString::null; }
+	virtual void			setValue(LLSD value) { }
 	virtual BOOL			getVisible() const { return TRUE; }
 	virtual void			setWidth(S32 width) = 0;
 	virtual void			highlightText(S32 offset, S32 num_chars) {}
 	virtual BOOL			isText() = 0;
 	virtual void			setColor(const LLColor4&) = 0;
+	virtual void			onCommit() {};
 
 	virtual BOOL	handleClick() { return FALSE; }
 	virtual	void	setEnabled(BOOL enable) { }
@@ -96,20 +98,24 @@ public:
 
 	virtual void    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;
 	virtual S32		getWidth() const			{ return mWidth; }
+	virtual S32		getContentWidth() const;
 	virtual void	setWidth(S32 width)			{ mWidth = width; }
 	virtual S32		getHeight() const			{ return llround(mFont->getLineHeight()); }
-	virtual const LLString&		getText() const		{ return mText.getString(); }
+	virtual const LLSD		getValue() const		{ return LLSD(mText.getString()); }
 	virtual BOOL	getVisible() const  { return mVisible; }
 	virtual void	highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
-	void			setText(const LLStringExplicit& text);
+
 	virtual void	setColor(const LLColor4&);
 	virtual BOOL	isText() { return TRUE; }
 
+	void			setText(const LLStringExplicit& text);
+	void			setFontStyle(const U8 font_style) { mFontStyle = font_style; }
+
 private:
 	LLUIString		mText;
 	const LLFontGL*	mFont;
 	LLColor4*		mColor;
-	const U8		mFontStyle;
+	U8				mFontStyle;
 	LLFontGL::HAlign mFontAlignment;
 	S32				mWidth;
 	BOOL			mVisible;
@@ -128,16 +134,16 @@ public:
 	/*virtual*/ ~LLScrollListIcon();
 	virtual void	drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;
 	virtual S32		getWidth() const			{ return mWidth; }
-	virtual S32		getHeight() const			{ return mIcon->getHeight(); }
-	virtual const LLString& getText() const { return mImageUUID; }
-	virtual const LLString& getTextLower() const { return mImageUUID; }
+	virtual S32		getHeight() const			{ return mIcon ? mIcon->getHeight() : 0; }
+	virtual const LLSD		getValue() const { return LLSD(mImageUUID); }
 	virtual void	setWidth(S32 width)			{ mWidth = width; }
 	virtual void	setColor(const LLColor4&);
 	virtual BOOL	isText() { return FALSE; }
+	virtual void	setValue(LLSD value);
 
 private:
 	LLPointer<LLImageGL> mIcon;
-	LLString mImageUUID;
+	LLUUID mImageUUID;
 	S32 mWidth;
 	LLColor4 mColor;
 };
@@ -151,9 +157,12 @@ public:
 	virtual S32		getWidth() const			{ return mWidth; }
 	virtual S32		getHeight() const			{ return 0; } 
 	virtual void	setWidth(S32 width)			{ mWidth = width; }
+	virtual const LLSD	getValue() const { return mCheckBox->getValue(); }
+	virtual void	setValue(LLSD value) { mCheckBox->setValue(value); }
+	virtual void	onCommit() { mCheckBox->onCommit(); }
 
 	virtual BOOL	handleClick();
-	virtual void	setEnabled(BOOL enable)		{ if (mCheckBox) mCheckBox->setEnabled(enable); }
+	virtual void	setEnabled(BOOL enable)		{ mCheckBox->setEnabled(enable); }
 	virtual void	setColor(const LLColor4& color) {};
 
 	LLCheckBoxCtrl*	getCheckBox()				{ return mCheckBox; }
@@ -266,6 +275,7 @@ public:
 
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+
 	/*virtual*/ void showList();
 	/*virtual*/ LLView*	findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding);
 	/*virtual*/ void userSetShape(const LLRect& new_rect);
@@ -333,8 +343,6 @@ public:
 
 	LLScrollListCell *getColumn(const S32 i) const	{ if (0 <= i && i < (S32)mColumns.size()) { return mColumns[i]; } return NULL; }
 
-	virtual BOOL handleClick(S32 x, S32 y, MASK mask);
-
 	LLString getContentsCSV();
 
 private:
@@ -370,9 +378,8 @@ public:
 	void			deleteAllItems() { clearRows(); }
 	
 	// Sets an array of column descriptors
-	void 	   		 setColumnHeadings(LLSD headings);
-	// Numerical based sort by column function (used by LLComboBox)
-	void   			 sortByColumn(U32 column, BOOL ascending);
+	void 	   		setColumnHeadings(LLSD headings);
+	void   			sortByColumn(U32 column, BOOL ascending);
 	
 	// LLCtrlListInterface functions
 	virtual S32  getItemCount() const;
@@ -421,18 +428,20 @@ public:
 	BOOL			isSorted();
 
 	virtual BOOL	isSelected(LLSD value);
-	
+
+	BOOL			handleClick(S32 x, S32 y, MASK mask);
 	BOOL			selectFirstItem();
 	BOOL			selectNthItem( S32 index );
 	BOOL			selectItemAt(S32 x, S32 y, MASK mask);
 	
-	void			deleteSingleItem( S32 index ) ;
+	void			deleteSingleItem( S32 index );
+	void			deleteItems(const LLSD& sd);
 	void 			deleteSelectedItems();
 	void			deselectAllItems(BOOL no_commit_on_change = FALSE);	// by default, go ahead and commit on selection change
 
 	void			highlightNthItem( S32 index );
 	void			setDoubleClickCallback( void (*cb)(void*) ) { mOnDoubleClickCallback = cb; }
-	void			setMaxiumumSelectCallback( void (*cb)(void*) ) { mOnMaximumSelectCallback = cb; }
+	void			setMaximumSelectCallback( void (*cb)(void*) ) { mOnMaximumSelectCallback = cb; }
 	void			setSortChangedCallback( void (*cb)(void*) ) { mOnSortChangedCallback = cb; }
 
 	void			swapWithNext(S32 index);
@@ -449,11 +458,12 @@ public:
 	LLScrollListItem* addSimpleItem( const LLString& item_text, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE );
 	// Add an item with an associated LLSD
 	LLScrollListItem* addSimpleItem(const LLString& item_text, LLSD sd, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE, S32 column_width = 0 );
+	LLScrollListItem* addSeparator(EAddPosition pos);
 
 	BOOL			selectSimpleItem( const LLString& item, BOOL case_sensitive = TRUE );		// FALSE if item not found
 	BOOL			selectSimpleItemByPrefix(const LLString& target, BOOL case_sensitive);
 	BOOL			selectSimpleItemByPrefix(const LLWString& target, BOOL case_sensitive);
-	const LLString&	getSimpleSelectedItem(S32 column = 0) const;
+	const LLString	getSimpleSelectedItem(S32 column = 0) const;
 	LLSD			getSimpleSelectedValue();
 
 	// DEPRECATED: Use LLSD versions of addSimpleItem() and getSimpleSelectedValue().
@@ -472,6 +482,8 @@ public:
 	LLScrollListItem*	getFirstData() const;
 	LLScrollListItem*	getLastData() const;
 	std::vector<LLScrollListItem*>	getAllData() const;
+
+	LLScrollListItem*	getItem(const LLSD& sd) const;
 	
 	void setAllowMultipleSelection(BOOL mult )	{ mAllowMultipleSelection = mult; }
 
@@ -501,28 +513,34 @@ public:
 
 	S32				getSearchColumn() { return mSearchColumn; }
 	void			setSearchColumn(S32 column) { mSearchColumn = column; }
+	S32				getColumnIndexFromOffset(S32 x);
+	S32				getColumnOffsetFromIndex(S32 index);
+	S32				getRowOffsetFromIndex(S32 index);
 
 	void			clearSearchString() { mSearchString.clear(); }
 
 	// Overridden from LLView
-	virtual void    draw();
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
-	virtual BOOL	handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
-	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
-	virtual void	setEnabled(BOOL enabled);
-	virtual void	setFocus( BOOL b );
-	virtual void	onFocusReceived();
-	virtual void	onFocusLost();
+	/*virtual*/ void    draw();
+	/*virtual*/ BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+	/*virtual*/ BOOL	handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+	/*virtual*/ BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
+	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
+	/*virtual*/ void	setEnabled(BOOL enabled);
+	/*virtual*/ void	setFocus( BOOL b );
+	/*virtual*/ void	onFocusReceived();
+	/*virtual*/ void	onFocusLost();
+	/*virtual*/ void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
 	virtual BOOL	isDirty() const;
 	virtual void	resetDirty();		// Clear dirty state
 
-	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-	virtual void	arrange(S32 max_width, S32 max_height);
+	virtual void	updateLayout();
+	virtual void	fitContents(S32 max_width, S32 max_height);
+
 	virtual LLRect	getRequiredRect();
 	static  BOOL    rowPreceeds(LLScrollListItem *new_row, LLScrollListItem *test_row);
 
@@ -534,12 +552,12 @@ public:
 	static void onClickColumn(void *userdata);
 
 	void updateColumns();
-	void updateMaxContentWidth(LLScrollListItem* changed_item);
+	void calcMaxContentWidth(LLScrollListItem* changed_item);
+	S32 getMaxContentWidth() { return mMaxContentWidth; }
 
 	void setDisplayHeading(BOOL display);
 	void setHeadingHeight(S32 heading_height);
 	void setCollapseEmptyColumns(BOOL collapse);
-	void setIsPopup(BOOL is_popup) { mIsPopup = is_popup; }
 
 	LLScrollListItem*	hitItem(S32 x,S32 y);
 	virtual void		scrollToShowSelected();
@@ -564,9 +582,11 @@ public:
 	void setTotalStaticColumnWidth(int width) { mTotalStaticColumnWidth = width; }
 
 	std::string     getSortColumnName();
-	BOOL			getSortAscending() { return mSortAscending; }
+	BOOL			getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }
+	BOOL			needsSorting();
 
 	S32		selectMultiple( LLDynamicArray<LLUUID> ids );
+	void			sortItems();
 
 protected:
 	// "Full" interface: use this when you're creating a list that has one or more of the following:
@@ -596,6 +616,7 @@ protected:
 	void			deselectItem(LLScrollListItem* itemp);
 	void			commitIfChanged();
 	void			setSorted(BOOL sorted);
+	BOOL			setSort(S32 column, BOOL ascending);
 
 protected:
 	S32				mCurIndex;			// For get[First/Next]Data
@@ -616,7 +637,6 @@ protected:
 	BOOL			mCanSelect;
 	BOOL			mDisplayColumnHeaders;
 	BOOL			mCollapseEmptyColumns;
-	BOOL			mIsPopup;
 
 	typedef std::deque<LLScrollListItem *> item_list;
 	item_list		mItemList;
@@ -626,7 +646,7 @@ protected:
 	S32				mMaxItemCount; 
 
 	LLRect			mItemListRect;
-
+	S32				mMaxContentWidth;
 	S32             mColumnPadding;
 
 	BOOL			mBackgroundVisible;
@@ -652,22 +672,29 @@ protected:
 	LLWString		mSearchString;
 	LLFrameTimer	mSearchTimer;
 	
-	LLString		mDefaultColumn;
+	LLString		mDefaultColumnName;
 
 	S32				mSearchColumn;
 	S32				mNumDynamicWidthColumns;
 	S32				mTotalStaticColumnWidth;
 
 	S32				mSortColumn;
+	S32				mSecondarySortColumn;
+	BOOL			mSecondarySortAscending;
 	BOOL			mSortAscending;
 	BOOL			mSorted;
-
+	
 	std::map<LLString, LLScrollListColumn> mColumns;
-	std::vector<LLScrollListColumn*> mColumnsIndexed;
 
 	BOOL			mDirty;
 	S32				mOriginalSelection;
 
+	typedef std::vector<LLScrollListColumn*> ordered_columns_t;
+	ordered_columns_t	mColumnsIndexed;
+
+	typedef std::pair<S32, BOOL> sort_column_t;
+	std::vector<sort_column_t>	mSortColumns;
+
 public:
 	// HACK:  Did we draw one selected item this frame?
 	BOOL mDrewSelected;