Added LLFloater::setTitleArg and LLFloater::setShortTitleArg.

This allows doing "[ARG]" replacement in floater titles.

3 files changed, 33 insertions, 8 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 64894ab..7eaaa42 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
+2010-01-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Added LLFloater::setTitleArg and LLFloater::setShortTitleArg.
+          This allows doing "[ARG]" replacement in floater titles.
+
+          modified:   linden/indra/llui/llfloater.cpp
+          modified:   linden/indra/llui/llfloater.h
+
+
 2010-01-03  Armin Weatherwax  <Armin.Weatherwax@gmail.com>
 
         * Several changes to work better on 64bit Linux.
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index defe200..e667bd4 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -691,11 +691,11 @@ void LLFloater::applyTitle()
 
         if (isMinimized() && !mShortTitle.empty())
         {
-                mDragHandle->setTitle( mShortTitle );
+                mDragHandle->setTitle( mShortTitle.getString() );
         }
         else
         {
-                mDragHandle->setTitle ( mTitle );
+                mDragHandle->setTitle ( mTitle.getString() );
         }
 }
 
@@ -706,7 +706,7 @@ const std::string& LLFloater::getCurrentTitle() const
 
 void LLFloater::setTitle( const std::string& title )
 {
-        mTitle = title;
+        mTitle.assign(title);
         applyTitle();
 }
 
@@ -718,13 +718,13 @@ std::string LLFloater::getTitle()
         }
         else
         {
-                return mTitle;
+                return mTitle.getString();
         }
 }
 
 void LLFloater::setShortTitle( const std::string& short_title )
 {
-        mShortTitle = short_title;
+        mShortTitle.assign(short_title);
         applyTitle();
 }
 
@@ -736,11 +736,25 @@ std::string LLFloater::getShortTitle()
         }
         else
         {
-                return mShortTitle;
+                return mShortTitle.getString();
         }
 }
 
 
+BOOL LLFloater::setTitleArg( const std::string& key, const LLStringExplicit& text )
+{
+        mTitle.setArg(key, text);
+        applyTitle();
+        return TRUE;
+}
+
+BOOL LLFloater::setShortTitleArg( const std::string& key, const LLStringExplicit& text )
+{
+        mShortTitle.setArg(key, text);
+        applyTitle();
+        return TRUE;
+}
+
 
 BOOL LLFloater::canSnapTo(const LLView* other_view)
 {
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 0e3d148..4906e85 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -165,6 +165,8 @@ public:
         std::string             getTitle();
         void                    setShortTitle( const std::string& short_title );
         std::string             getShortTitle();
+        BOOL setTitleArg( const std::string& key, const LLStringExplicit& text );
+        BOOL setShortTitleArg( const std::string& key, const LLStringExplicit& text );
         void                    setTitleVisible(bool visible);
         virtual void    setMinimized(BOOL b);
         void                    moveResizeHandlesToFront();
@@ -276,8 +278,8 @@ private:
         BOOL                    mMinimized;
         BOOL                    mForeground;
         LLHandle<LLFloater>     mDependeeHandle;
-        std::string             mTitle;
-        std::string             mShortTitle;
+        LLUIString              mTitle;
+        LLUIString              mShortTitle;
 
         BOOL                    mFirstLook;                     // TRUE if the _next_ time this floater is visible will be the first time in the session that it is visible.