From edd0e47d5cb3eb173da4d6710ce6a83f771a0246 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 22 Apr 2010 12:40:36 +0300
Subject: Fixed EXT-6597(normal) - Clicking the maturity rating icons in the
 navbar need tooltips and clicking should link to a help article.

Added LLButton::setImagePressed(), there was no way to set pressed image at run-time. The only place where pressed image is initialized was LLButton constructor.

Replaced Maturity icon with button to simplify handling clicks. Icon does not provide click callback and we would need to handle mouse up/down events and track clicked widget.

Added icon for Moderate regions.

Did not find maturity help topic, added a "TODO".

Reviewed by Sergey Litovchuk - https://codereview.productengine.com/secondlife/r/243/

--HG--
branch : product-engine
---
 indra/newview/lllocationinputctrl.h | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'indra/newview/lllocationinputctrl.h')

diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index f790140f07..fc7adf60b0 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -66,17 +66,19 @@ public:
 	{
 		Optional<LLUIImage*>				icon_maturity_general,
 											icon_maturity_adult,
+											icon_maturity_moderate,
 											add_landmark_image_enabled,
 											add_landmark_image_disabled,
 											add_landmark_image_hover,
 											add_landmark_image_selected;
+		Optional<std::string>				maturity_help_topic;
 		Optional<S32>						icon_hpad,
 											add_landmark_hpad;
-		Optional<LLButton::Params>			add_landmark_button,
+		Optional<LLButton::Params>			maturity_button,
+											add_landmark_button,
 											for_sale_button,
 											info_button;
-		Optional<LLIconCtrl::Params>		maturity_icon,
-											voice_icon,
+		Optional<LLIconCtrl::Params>		voice_icon,
 											fly_icon,
 											push_icon,
 											build_icon,
@@ -136,8 +138,8 @@ private:
 	void					refreshParcelIcons();
 	// Refresh the value in the health percentage text field
 	void					refreshHealth();
-	void					refreshMaturityIcon();
-	void					positionMaturityIcon();
+	void					refreshMaturityButton();
+	void					positionMaturityButton();
 	
 	void					rebuildLocationHistory(const std::string& filter = LLStringUtil::null);
 	bool 					findTeleportItemsByTitle(const LLTeleportHistoryItem& item, const std::string& filter);
@@ -156,6 +158,7 @@ private:
 	void					onForSaleButtonClicked();
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
+	void					onMaturityButtonClicked();
 	// callbacks
 	bool					onLocationContextMenuItemEnabled(const LLSD& userdata);
 	void 					onLocationContextMenuItemClicked(const LLSD& userdata);
@@ -168,7 +171,7 @@ private:
 	S32						mIconHPad;			// pad between all icons
 	S32						mAddLandmarkHPad;	// pad to left of landmark star
 
-	LLIconCtrl*	mMaturityIcon;
+	LLButton*	mMaturityButton;
 	LLIconCtrl*	mParcelIcon[ICON_COUNT];
 	LLTextBox* mDamageText;
 
@@ -182,14 +185,16 @@ private:
 	boost::signals2::connection	mLocationHistoryConnection;
 	LLUIImage* mLandmarkImageOn;
 	LLUIImage* mLandmarkImageOff;
-	LLUIImage* mIconMaturityGeneral;
-	LLUIImage* mIconMaturityAdult;
+	LLPointer<LLUIImage> mIconMaturityGeneral;
+	LLPointer<LLUIImage> mIconMaturityAdult;
+	LLPointer<LLUIImage> mIconMaturityModerate;
 
 	std::string mAddLandmarkTooltip;
 	std::string mEditLandmarkTooltip;
 	// this field holds a human-readable form of the location string, it is needed to be able to compare copy-pated value and real location
 	std::string mHumanReadableLocation;
 	bool isHumanReadableLocationVisible;
+	std::string mMaturityHelpTopic;
 };
 
 #endif
-- 
cgit v1.2.3