Created new preferences panel to handle chat colors and name highlighting (removes the 'Extras' panel from Prefs > Advanced and moves the color options from 'Text Chat')

10 files changed, 478 insertions, 277 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index e3a1745..a4d99f2 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -333,6 +333,7 @@ set(viewer_SOURCE_FILES
     llpolymorph.cpp
     llprefsadvanced.cpp
     llprefschat.cpp
+    llprefscolors.cpp
     llprefsim.cpp
     llprefsvoice.cpp
     llpreviewanim.cpp
@@ -790,6 +791,7 @@ set(viewer_HEADER_FILES
     llpolymorph.h
     llprefsadvanced.h
     llprefschat.h
+    llprefscolors.h
     llprefsim.h
     llprefsvoice.h
     llpreview.h
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index b740725..906cf11 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -64,6 +64,7 @@
 #include "llpanelskins.h"
 #include "llprefsadvanced.h"
 #include "llprefschat.h"
+#include "llprefscolors.h"
 #include "llprefsvoice.h"
 #include "llprefsim.h"
 #include "llresizehandle.h"
@@ -133,6 +134,7 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mAudioPanel(NULL),
         mMsgPanel(NULL),
         mSkinsPanel(NULL),
+        mPrefsColors(NULL),
         mLCDPanel(NULL),
         mPrefsFonts(NULL),
         mPrefsAdvanced(NULL)
@@ -190,6 +192,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mMsgPanel = new LLPanelMsgs();
         mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mMsgPanel->setDefaultBtn(default_btn);
+
+        mPrefsColors = new LLPrefsColors();
+        mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mPrefsColors->setDefaultBtn(default_btn);
         
         mSkinsPanel = new LLPanelSkins();
         mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
@@ -272,7 +278,11 @@ LLPreferenceCore::~LLPreferenceCore()
                 delete mPrefsFonts;
                 mPrefsFonts = NULL;
         }
-
+        if (mPrefsColors)
+        {
+                delete mPrefsColors;
+                mPrefsColors = NULL;
+        }
 }
 
 
@@ -290,6 +300,7 @@ void LLPreferenceCore::apply()
         mSkinsPanel->apply();
         mPrefsAdvanced->apply();
         mPrefsFonts->apply();
+        mPrefsColors->apply();
 
         // hardware menu apply
         LLFloaterHardwareSettings::instance()->apply();
@@ -320,6 +331,7 @@ void LLPreferenceCore::cancel()
         mSkinsPanel->cancel();
         mPrefsAdvanced->cancel();
         mPrefsFonts->cancel();
+        mPrefsColors->cancel();
 
         // cancel hardware menu
         LLFloaterHardwareSettings::instance()->cancel();
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index e98c45c..c52f541 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -57,6 +57,7 @@ class LLPanelMsgs;
 class LLPanelSkins;
 class LLPrefsAdvanced;
 class ImpPrefsFonts;
+class LLPrefsColors;
 class LLScrollListCtrl;
 
 class LLPreferenceCore
@@ -94,6 +95,7 @@ private:
         LLPanelMsgs                             *mMsgPanel;
         LLPanelLCD                              *mLCDPanel;
         LLPrefsAdvanced                 *mPrefsAdvanced;
+        LLPrefsColors                   *mPrefsColors;
   ImpPrefsFonts* mPrefsFonts;
 };
 
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index aa62b34..99bc4fd 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -116,15 +116,6 @@ BOOL LLPrefsAdvanced::postBuild()
 
         initHelpBtn("EmeraldHelp_SpellCheck",           "EmeraldHelp_SpellCheck");
 
-        childSetValue("HighlightOwnNameInIM", gSavedSettings.getBOOL("HighlightOwnNameInIM"));
-        childSetValue("HighlightFriendsChat", gSavedSettings.getBOOL("HighlightFriendsChat"));
-        getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor"));
-        childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat"));
-        getChild<LLColorSwatchCtrl>("OwnNameChatColor")->set(gSavedSettings.getColor4("OwnNameChatColor"));
-        childSetValue("nick01", gSavedSettings.getString("nick01"));
-        childSetValue("nick02", gSavedSettings.getString("nick02"));
-        childSetValue("nick03", gSavedSettings.getString("nick03"));
-
         refresh();
 
         return TRUE;
@@ -147,24 +138,6 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setU32("LightShareAllowed",
                               (U32)childGetValue("lightshare_combo").asInteger());
 
-        gSavedSettings.setBOOL("HighlightOwnNameInIM", childGetValue("HighlightOwnNameInIM"));
-        gSavedSettings.setBOOL("HighlightFriendsChat", childGetValue("HighlightFriendsChat"));
-        gSavedSettings.setColor4("FriendsChatColor", getChild<LLColorSwatchCtrl>("FriendsChatColor")->get());
-        gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat"));
-        gSavedSettings.setColor4("OwnNameChatColor", getChild<LLColorSwatchCtrl>("OwnNameChatColor")->get());
-
-        std::string nick01 = childGetValue("nick01");
-        boost::trim(nick01);
-        gSavedSettings.setString("nick01", nick01);
-
-        std::string nick02 = childGetValue("nick02");
-        boost::trim(nick02);
-        gSavedSettings.setString("nick02", nick02);
-
-        std::string nick03 = childGetValue("nick03");
-        boost::trim(nick03);
-        gSavedSettings.setString("nick03", nick03);
-
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
         if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
         {
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 8d704d5..5f74a25 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -36,10 +36,8 @@
 #include "llchatbar.h"
 #include "llfloaterchat.h"
 #include "llprefschat.h"
-#include "lltexteditor.h"
 #include "llviewercontrol.h"
 #include "lluictrlfactory.h"
-#include "llcolorswatch.h"
 #include "llradiogroup.h"
 #include "llstylemap.h"
 
@@ -57,15 +55,6 @@ private:
         S32     mChatSize;
         F32     mChatPersist;
         S32     mChatMaxLines;
-        LLColor4 mSystemChatColor;
-        LLColor4 mUserChatColor;
-        LLColor4 mAgentChatColor;
-        LLColor4 mIMChatColor;
-        LLColor4 mObjectChatColor;
-        LLColor4 mOwnerSayChatColor;
-        LLColor4 mBGChatColor;
-        LLColor4 mScriptErrorColor;
-        LLColor4 mHTMLLinkColor;
         BOOL mChatFullWidth;
         BOOL mCloseChatOnReturn;
         BOOL mArrowKeysMoveAvatar;
@@ -92,16 +81,6 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         childSetValue("fade_chat_time", gSavedSettings.getF32("ChatPersistTime"));
         childSetValue("max_chat_count", gSavedSettings.getS32("ConsoleMaxLines"));
 
-        getChild<LLColorSwatchCtrl>("system")->set(gSavedSettings.getColor4("SystemChatColor"));
-        getChild<LLColorSwatchCtrl>("user")->set(gSavedSettings.getColor4("UserChatColor"));
-        getChild<LLColorSwatchCtrl>("agent")->set(gSavedSettings.getColor4("AgentChatColor"));
-        getChild<LLColorSwatchCtrl>("im")->set(gSavedSettings.getColor4("IMChatColor"));
-        getChild<LLColorSwatchCtrl>("script_error")->set(gSavedSettings.getColor4("ScriptErrorColor"));
-        getChild<LLColorSwatchCtrl>("objects")->set(gSavedSettings.getColor4("ObjectChatColor"));
-        getChild<LLColorSwatchCtrl>("owner")->set(gSavedSettings.getColor4("llOwnerSayChatColor"));
-        getChild<LLColorSwatchCtrl>("background")->set(gSavedSettings.getColor4("BackgroundChatColor"));
-        getChild<LLColorSwatchCtrl>("links")->set(gSavedSettings.getColor4("HTMLLinkColor"));
-
         childSetValue("arrow_keys_move_avatar_check", gSavedSettings.getBOOL("ArrowKeysMoveAvatar"));
         childSetValue("show_timestamps_check", gSavedSettings.getBOOL("ChatShowTimestamps"));
         childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat"));
@@ -124,15 +103,6 @@ void LLPrefsChatImpl::refreshValues()
         mChatSize = gSavedSettings.getS32("ChatFontSize");
         mChatPersist = gSavedSettings.getF32("ChatPersistTime");
         mChatMaxLines = gSavedSettings.getS32("ConsoleMaxLines");
-        mSystemChatColor = gSavedSettings.getColor4("SystemChatColor");
-        mUserChatColor = gSavedSettings.getColor4("UserChatColor");
-        mAgentChatColor = gSavedSettings.getColor4("AgentChatColor");
-        mIMChatColor = gSavedSettings.getColor4("IMChatColor");
-        mObjectChatColor = gSavedSettings.getColor4("ObjectChatColor");
-        mOwnerSayChatColor = gSavedSettings.getColor4("llOwnerSayChatColor");
-        mBGChatColor = gSavedSettings.getColor4("BackgroundChatColor");
-        mScriptErrorColor = gSavedSettings.getColor4("ScriptErrorColor");
-        mHTMLLinkColor = gSavedSettings.getColor4("HTMLLinkColor");
         mArrowKeysMoveAvatar = gSavedSettings.getBOOL("ArrowKeysMoveAvatar");
         mShowTimestamps = gSavedSettings.getBOOL("ChatShowTimestamps");
         mScriptErrorAsChat = gSavedSettings.getBOOL("ScriptErrorsAsChat");
@@ -154,15 +124,6 @@ void LLPrefsChatImpl::cancel()
         gSavedSettings.setS32("ChatFontSize", mChatSize);
         gSavedSettings.setF32("ChatPersistTime", mChatPersist);
         gSavedSettings.setS32("ConsoleMaxLines", mChatMaxLines);
-        gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
-        gSavedSettings.setColor4("UserChatColor", mUserChatColor);
-        gSavedSettings.setColor4("AgentChatColor", mAgentChatColor);
-        gSavedSettings.setColor4("IMChatColor", mIMChatColor);
-        gSavedSettings.setColor4("ObjectChatColor", mObjectChatColor);
-        gSavedSettings.setColor4("llOwnerSayChatColor", mOwnerSayChatColor);
-        gSavedSettings.setColor4("BackgroundChatColor", mBGChatColor);
-        gSavedSettings.setColor4("ScriptErrorColor", mScriptErrorColor);
-        gSavedSettings.setColor4("HTMLLinkColor", mHTMLLinkColor);
         gSavedSettings.setBOOL("ArrowKeysMoveAvatar", mArrowKeysMoveAvatar);
         gSavedSettings.setBOOL("ChatShowTimestamps", mShowTimestamps);
         gSavedSettings.setBOOL("ScriptErrorsAsChat", mScriptErrorAsChat);
@@ -184,18 +145,6 @@ void LLPrefsChatImpl::apply()
         gSavedSettings.setF32("ChatPersistTime", childGetValue("fade_chat_time").asReal());
         gSavedSettings.setS32("ConsoleMaxLines", childGetValue("max_chat_count"));
 
-        gSavedSettings.setColor4("SystemChatColor", childGetValue("system"));
-        gSavedSettings.setColor4("UserChatColor", childGetValue("user"));
-        gSavedSettings.setColor4("AgentChatColor", childGetValue("agent"));
-        gSavedSettings.setColor4("IMChatColor", childGetValue("im"));
-        gSavedSettings.setColor4("ScriptErrorColor", childGetValue("script_error"));
-        gSavedSettings.setColor4("ObjectChatColor", childGetValue("objects"));
-        gSavedSettings.setColor4("llOwnerSayChatColor", childGetValue("owner"));
-        gSavedSettings.setColor4("BackgroundChatColor", childGetValue("background"));
-
-        gSavedSettings.setColor4("HTMLLinkColor", childGetValue("links"));
-        LLTextEditor::setLinkColor(childGetValue("links"));
-
         gSavedSettings.setBOOL("ArrowKeysMoveAvatar", childGetValue("arrow_keys_move_avatar_check"));
         gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check"));
         gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
new file mode 100644
index 0000000..9a30fcd
--- /dev/null
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -0,0 +1,180 @@
+/**
+* @file llprefscolors.cpp
+* @brief Color-specific preferences for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llprefscolors.h"
+#include "lltexteditor.h"
+#include "llviewercontrol.h"
+
+#include "lluictrlfactory.h"
+#include "llcolorswatch.h"
+
+#include "boost/algorithm/string.hpp"
+
+LLPrefsColors::LLPrefsColors()
+{
+        refreshColors(); // initialize member data from saved settings
+
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_colors.xml");
+}
+
+LLPrefsColors::~LLPrefsColors()
+{
+        // Children all cleaned up by default view destructor.
+}
+
+BOOL LLPrefsColors::postBuild()
+{
+        getChild<LLColorSwatchCtrl>("system")->set(gSavedSettings.getColor4("SystemChatColor"));
+        getChild<LLColorSwatchCtrl>("user")->set(gSavedSettings.getColor4("UserChatColor"));
+        getChild<LLColorSwatchCtrl>("agent")->set(gSavedSettings.getColor4("AgentChatColor"));
+        getChild<LLColorSwatchCtrl>("im")->set(gSavedSettings.getColor4("IMChatColor"));
+        getChild<LLColorSwatchCtrl>("script_error")->set(gSavedSettings.getColor4("ScriptErrorColor"));
+        getChild<LLColorSwatchCtrl>("objects")->set(gSavedSettings.getColor4("ObjectChatColor"));
+        getChild<LLColorSwatchCtrl>("owner")->set(gSavedSettings.getColor4("llOwnerSayChatColor"));
+        getChild<LLColorSwatchCtrl>("background")->set(gSavedSettings.getColor4("BackgroundChatColor"));
+        getChild<LLColorSwatchCtrl>("links")->set(gSavedSettings.getColor4("HTMLLinkColor"));
+        getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor"));
+        getChild<LLColorSwatchCtrl>("OwnNameChatColor")->set(gSavedSettings.getColor4("OwnNameChatColor"));
+
+        childSetValue("HighlightOwnNameInIM", gSavedSettings.getBOOL("HighlightOwnNameInIM"));
+        childSetValue("HighlightFriendsChat", gSavedSettings.getBOOL("HighlightFriendsChat"));
+        childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat"));
+        updateSelfCheck();
+        updateFriendsCheck();
+        
+        childSetValue("nick01", gSavedSettings.getString("nick01"));
+        childSetValue("nick02", gSavedSettings.getString("nick02"));
+        childSetValue("nick03", gSavedSettings.getString("nick03"));
+
+        childSetCommitCallback("HighlightOwnNameInIM", onCommitCheckSelfName, this);
+        childSetCommitCallback("HighlightOwnNameInChat", onCommitCheckSelfName, this);
+        childSetCommitCallback("HighlightFriendsChat", onCommitCheckFriends, this);
+
+        return TRUE;
+}
+
+void LLPrefsColors::refreshColors()
+{
+        mSystemChatColor = gSavedSettings.getColor4("SystemChatColor");
+        mUserChatColor = gSavedSettings.getColor4("UserChatColor");
+        mAgentChatColor = gSavedSettings.getColor4("AgentChatColor");
+        mIMChatColor = gSavedSettings.getColor4("IMChatColor");
+        mObjectChatColor = gSavedSettings.getColor4("ObjectChatColor");
+        mOwnerSayChatColor = gSavedSettings.getColor4("llOwnerSayChatColor");
+        mBGChatColor = gSavedSettings.getColor4("BackgroundChatColor");
+        mScriptErrorColor = gSavedSettings.getColor4("ScriptErrorColor");
+        mHTMLLinkColor = gSavedSettings.getColor4("HTMLLinkColor");
+        mFriendsChatColor = gSavedSettings.getColor4("FriendsChatColor");
+        mOwnNameChatColor = gSavedSettings.getColor4("OwnNameChatColor");
+}
+
+// static
+void LLPrefsColors::onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata)
+{
+        LLPrefsColors* self = (LLPrefsColors*)userdata;
+        self->updateSelfCheck();
+}
+
+void LLPrefsColors::updateSelfCheck()
+{
+        bool highlight_names_enabled = (childGetValue("HighlightOwnNameInIM") || childGetValue("HighlightOwnNameInChat"));
+
+        getChild<LLColorSwatchCtrl>("OwnNameChatColor")->setEnabled(highlight_names_enabled);
+        childSetEnabled("nick01", highlight_names_enabled);
+        childSetEnabled("nick02", highlight_names_enabled);
+        childSetEnabled("nick03", highlight_names_enabled);
+        childSetEnabled("nick01_text", highlight_names_enabled);
+        childSetEnabled("nick02_text", highlight_names_enabled);
+        childSetEnabled("nick03_text", highlight_names_enabled);
+}
+
+// static
+void LLPrefsColors::onCommitCheckFriends(LLUICtrl* ctrl, void* userdata)
+{
+        LLPrefsColors* self = (LLPrefsColors*)userdata;
+        self->updateFriendsCheck();
+}
+
+void LLPrefsColors::updateFriendsCheck()
+{
+        getChild<LLColorSwatchCtrl>("FriendsChatColor")->setEnabled(childGetValue("HighlightFriendsChat"));
+}
+
+void LLPrefsColors::cancel()
+{
+        gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
+        gSavedSettings.setColor4("UserChatColor", mUserChatColor);
+        gSavedSettings.setColor4("AgentChatColor", mAgentChatColor);
+        gSavedSettings.setColor4("IMChatColor", mIMChatColor);
+        gSavedSettings.setColor4("ObjectChatColor", mObjectChatColor);
+        gSavedSettings.setColor4("llOwnerSayChatColor", mOwnerSayChatColor);
+        gSavedSettings.setColor4("BackgroundChatColor", mBGChatColor);
+        gSavedSettings.setColor4("ScriptErrorColor", mScriptErrorColor);
+        gSavedSettings.setColor4("HTMLLinkColor", mHTMLLinkColor);
+        gSavedSettings.setColor4("FriendsChatColor", mFriendsChatColor);
+        gSavedSettings.setColor4("OwnNameChatColor", mOwnNameChatColor);
+}
+
+void LLPrefsColors::apply()
+{
+        gSavedSettings.setColor4("SystemChatColor", childGetValue("system"));
+        gSavedSettings.setColor4("UserChatColor", childGetValue("user"));
+        gSavedSettings.setColor4("AgentChatColor", childGetValue("agent"));
+        gSavedSettings.setColor4("IMChatColor", childGetValue("im"));
+        gSavedSettings.setColor4("ScriptErrorColor", childGetValue("script_error"));
+        gSavedSettings.setColor4("ObjectChatColor", childGetValue("objects"));
+        gSavedSettings.setColor4("llOwnerSayChatColor", childGetValue("owner"));
+        gSavedSettings.setColor4("BackgroundChatColor", childGetValue("background"));
+
+        gSavedSettings.setColor4("HTMLLinkColor", childGetValue("links"));
+        LLTextEditor::setLinkColor(childGetValue("links"));
+
+        gSavedSettings.setBOOL("HighlightOwnNameInIM", childGetValue("HighlightOwnNameInIM"));
+        gSavedSettings.setBOOL("HighlightFriendsChat", childGetValue("HighlightFriendsChat"));
+        gSavedSettings.setColor4("FriendsChatColor", getChild<LLColorSwatchCtrl>("FriendsChatColor")->get());
+        gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat"));
+        gSavedSettings.setColor4("OwnNameChatColor", getChild<LLColorSwatchCtrl>("OwnNameChatColor")->get());
+
+        std::string nick01 = childGetValue("nick01");
+        boost::trim(nick01);
+        gSavedSettings.setString("nick01", nick01);
+
+        std::string nick02 = childGetValue("nick02");
+        boost::trim(nick02);
+        gSavedSettings.setString("nick02", nick02);
+
+        std::string nick03 = childGetValue("nick03");
+        boost::trim(nick03);
+        gSavedSettings.setString("nick03", nick03);
+
+        refreshColors(); // member values become the official values and cancel becomes a no-op.
+}
diff --git a/linden/indra/newview/llprefscolors.h b/linden/indra/newview/llprefscolors.h
new file mode 100644
index 0000000..70bda89
--- /dev/null
+++ b/linden/indra/newview/llprefscolors.h
@@ -0,0 +1,67 @@
+/**
+* @file llprefscolors.h
+* @brief Advanced preferences options for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LLPREFSCOLORS_H
+#define LLPREFSCOLORS_H
+
+#include "llpanel.h"
+
+class LLPrefsColors : public LLPanel
+{
+public:
+        LLPrefsColors();
+        ~LLPrefsColors();
+
+        BOOL postBuild();
+
+        void apply();
+        void cancel();
+
+private:
+        static void onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata);
+        static void onCommitCheckFriends(LLUICtrl* ctrl, void* userdata);
+        void refreshColors();
+        void updateFriendsCheck();
+        void updateSelfCheck();
+
+        LLColor4 mSystemChatColor;
+        LLColor4 mUserChatColor;
+        LLColor4 mAgentChatColor;
+        LLColor4 mIMChatColor;
+        LLColor4 mObjectChatColor;
+        LLColor4 mOwnerSayChatColor;
+        LLColor4 mBGChatColor;
+        LLColor4 mScriptErrorColor;
+        LLColor4 mHTMLLinkColor;
+        LLColor4 mFriendsChatColor;
+        LLColor4 mOwnNameChatColor;
+};
+
+#endif //LLPREFSCOLORS_H
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 0f2181b..1b771b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -179,57 +179,6 @@ To use spellcheck, right-click a misspelled word
          tool_tip="Modify the AutoCorrect word list and settings" left="12"
          bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
     </panel>
-    
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Extra" 
-    left="1" mouse_opaque="true" name="Extra" width="418">
-
-        <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-            initial_value="true" label="Show chat messages from friends in a different color" left="12"
-            mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
-
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
-            can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
-            enabled="true" follows="left|top" height="67" label="Friends" left_delta="68"
-            mouse_opaque="true" name="FriendsChatColor" width="65" />
-
-        <check_box bottom_delta="-30" enabled="true" follows="left|top"
-                 font="SansSerifSmall" height="16" initial_value="true"
-                 label="Show chat messages containing your name in a different color" left="12" mouse_opaque="true"
-                 name="HighlightOwnNameInChat" radio_style="false" width="217" />
-
-                <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-            initial_value="true" label="Show GroupIM messages containing your name in a different color" left="12"
-            mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
-
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230"
-            can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
-            enabled="true" follows="left|top" height="67" label="Own Name" left_delta="68"
-            mouse_opaque="true" name="OwnNameChatColor" width="65" />
-
-                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-50"
-                        enabled="true" follows="left|top" font="SansSerif"
-                        handle_edit_keys_directly="true" height="20" left_delta="0"
-                        max_length="50" mouse_opaque="true" name="nick01"
-                        select_all_on_focus_received="true" width="400" word_wrap="false" />
 
-                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick01_text" width="70">Nick 1</text>
-
-                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
-                        enabled="true" follows="left|top" font="SansSerif"
-                        handle_edit_keys_directly="true" height="20" left_delta="60"
-                        max_length="50" mouse_opaque="true" name="nick02"
-                        select_all_on_focus_received="true" width="400" word_wrap="false" />
-
-                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick02_text" width="70">Nick 2</text>
-
-                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
-                        enabled="true" follows="left|top" font="SansSerif"
-                        handle_edit_keys_directly="true" height="20" left_delta="60"
-                        max_length="50" mouse_opaque="true" name="nick03"
-                        select_all_on_focus_received="true" width="400" word_wrap="false" />
-
-                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick03_text" width="70">Nick 3</text>
-
-    </panel>
   </tab_container>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index fe60203..27d3fa4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -24,60 +24,84 @@
                         Large
                 </radio_item>
         </radio_group>
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+     mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
+    Translate Chat:
+  </text>
+  <check_box bottom_delta="-3" control_name="TranslateChat" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
+             name="translate_chat" radio_style="false" width="237" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
+             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
+    Translate into this language:
+  </text>
+  <combo_box allow_text_entry="true" bottom_delta="-5" enabled="true"
+             follows="left|top" height="16" left_delta="183" max_chars="135"
+             mouse_opaque="true" name="translate_language_combobox" width="146">
+    <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+      System Default
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="English" value="en">
+      English
+    </combo_item>
+
+    <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+
+    <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+      Dansk (Danish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+      Deutsch (German)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+      Español (Spanish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+      Français (French)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+      Italiano (Italian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+      Magyar (Hungarian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+      Nederlands (Dutch)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+      Polski (Polish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+      Portugués (Portuguese)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+      Русский (Russian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+      Türkçe (Turkish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+      Українська (Ukrainian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+      中文 (简体) (Chinese)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+      日本語 (Japanese)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+      한국어 (Korean)
+    </combo_item>
+  </combo_box>
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-                Color:
-        </text>
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-             enabled="true" follows="left|top" height="56" label="You" left="148"
-             mouse_opaque="true" name="user" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-             enabled="true" follows="left|top" height="56" label="Others" left_delta="68"
-             mouse_opaque="true" name="agent" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="56" label="IMs" left_delta="68"
-             mouse_opaque="true" name="im" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="0.8 1 1 1"
-             enabled="true" follows="left|top"
-             height="56" label="System" left_delta="68" mouse_opaque="true"
-             name="system" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="0.82 0.82 0.99 1"
-             control_name="ScriptErrorColor" enabled="true" follows="left|top"
-             height="56" label="Errors" left_delta="68" mouse_opaque="true"
-             name="script_error" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
-             can_apply_immediately="true" color="0.7 0.9 0.7 1"
-             control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="56" label="Objects" left="148" mouse_opaque="true"
-             name="objects" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
-             can_apply_immediately="true" color="0.7 0.9 0.7 1"
-       control_name="ObjectIMColor" enabled="true" follows="left|top"
-             height="56" label="Object IMs" left_delta="68" mouse_opaque="true"
-       name="object_ims" width="54" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
-             can_apply_immediately="true" color="0.7 0.9 0.7 1"
-             enabled="true" follows="left|top"
-             height="56" label="Owner" left_delta="68" mouse_opaque="true" name="owner"
-             width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
-             can_apply_immediately="true" color="0 0 0 1"
-             enabled="true" follows="left|top"
-             height="56" label="Bubble" left_delta="68" mouse_opaque="true"
-             name="background" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
-             can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="56"
-             label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box3" v_pad="0" width="135">
                 Chat Console:
@@ -115,8 +139,29 @@
              label="Use full screen width  (requires restart)" left="148"
              mouse_opaque="true" name="chat_full_width_check" radio_style="false"
              width="239" />
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
+    Chat Bubbles:
+  </text>
+  <check_box bottom_delta="-8" control_name="UseChatBubbles" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show chat bubbles" left="148" mouse_opaque="true"
+             name="bubble_text_chat" radio_style="false" width="237" />
+  <check_box bottom_delta="-0" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show local chat and bubbles" left="288" mouse_opaque="true"
+             name="local_bubble_text_chat" radio_style="false" width="237" />
+  <slider bottom_delta="-20" can_edit_text="false" control_name="ChatBubbleOpacity"
+             decimal_digits="3" enabled="true" follows="left|top" height="12"
+             increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
+             min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
+             value="0.5" width="225" />
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-              bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+              bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box6" v_pad="0" width="135">
     Miscellaneous:
@@ -147,98 +192,5 @@
              font="SansSerifSmall" height="16" initial_value="false" 
              label="Show custom chat channel" left="148" mouse_opaque="true"
              name="toggle_channel_control" radio_style="false" width="237" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box7" v_pad="0" width="128">
-                Chat Bubbles:
-        </text>
-  <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show chat bubbles" left="148" mouse_opaque="true"
-             name="bubble_text_chat" radio_style="false" width="237" />
-  <check_box bottom="-386" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show local chat and bubbles" left="288" mouse_opaque="true"
-             name="local_bubble_text_chat" radio_style="false" width="237" />
-  <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
-             decimal_digits="3" enabled="true" follows="left|top" height="12"
-             increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
-             min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
-             value="0.5" width="225" />
 
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-420" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
-                Translate Chat:
-        </text>
-        <check_box bottom="-427" control_name="TranslateChat" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
-             name="translate_chat" radio_style="false" width="237" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-442" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
-             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
-                Translate into this language:
-        </text> 
-        <combo_box allow_text_entry="true" bottom="-448" enabled="true"
-             follows="left|top" height="16" left_delta="183" max_chars="135"
-             mouse_opaque="true" name="translate_language_combobox" width="146">
-                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
-                        System Default
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="English" value="en">
-                        English
-                </combo_item>
-                
-                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
-                
-                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
-                        Dansk (Danish)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
-                        Deutsch (German)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-                        Español (Spanish)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="French" value="fr">
-                        Français (French)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
-                        Italiano (Italian)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
-                        Magyar (Hungarian)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
-                        Nederlands (Dutch)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
-                        Polski (Polish)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-                        Portugués (Portuguese)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
-                        Русский (Russian)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
-                        Türkçe (Turkish)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
-                        Українська (Ukrainian)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        中文 (简体) (Chinese)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-                        日本語 (Japanese)
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-                        한국어 (Korean)
-                </combo_item>
-        </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
new file mode 100644
index 0000000..11810d2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+    height="408" label="Colors" left="102" mouse_opaque="true" name="colors"
+    width="517">
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+             mouse_opaque="false" name="text_box2" v_pad="0" width="128">
+    Chat Colors:
+  </text>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
+             enabled="true" follows="left|top" height="65" label="Your chat" left="120"
+             mouse_opaque="true" name="user" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
+             enabled="true" follows="left|top" height="65" label="Others' chat" left_delta="76"
+             mouse_opaque="true" name="agent" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="0.6 0.6 1 1"
+             enabled="true" follows="left|top" height="65" label="IMs" left_delta="76"
+             mouse_opaque="true" name="im" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="0.8 1 1 1"
+             enabled="true" follows="left|top"
+             height="65" label="System" left_delta="76" mouse_opaque="true"
+             name="system" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="0.82 0.82 0.99 1"
+             control_name="ScriptErrorColor" enabled="true" follows="left|top"
+             height="65" label="Script errors" left_delta="76" mouse_opaque="true"
+             name="script_error" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+             control_name="ObjectChatColor" enabled="true" follows="left|top"
+             height="65" label="Object chat" left="120" mouse_opaque="true"
+             name="objects" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+       control_name="ObjectIMColor" enabled="true" follows="left|top"
+             height="65" label="Object IMs" left_delta="76" mouse_opaque="true"
+       name="object_ims" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+             enabled="true" follows="left|top"
+             height="65" label="Owner chat" left_delta="76" mouse_opaque="true" name="owner"
+             width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0 0 0 1"
+             enabled="true" follows="left|top"
+             height="65" label="Bubble chat" left_delta="76" mouse_opaque="true"
+             name="background" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.6 0.6 1 1"
+             enabled="true" follows="left|top" height="65"
+             label="Links" left_delta="76" mouse_opaque="true" name="links" width="65" />
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+     mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+    Line Highlighting:
+  </text>
+
+  <check_box bottom_delta="-7" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+      initial_value="true" label="Highlight chat from friends" left="120"
+      mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
+      can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
+      enabled="true" follows="left|top" height="65" label="Friends" left_delta="20"
+      mouse_opaque="true" name="FriendsChatColor" width="65" />
+
+  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+     font="SansSerifSmall" height="16" initial_value="true"
+     label="Highlight local chat containing your name" left="120" mouse_opaque="true"
+     name="HighlightOwnNameInChat" radio_style="false" width="217" />
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+      initial_value="true" label="Highlight group chat containing your name" left_delta="0"
+      mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
+      can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
+      enabled="true" follows="left|top" height="65" label="Your name" left_delta="20"
+      mouse_opaque="true" name="OwnNameChatColor" width="65" />
+
+  <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="20" 
+      left="140" name="nick01_text" width="150">
+    Highlight nickname 1:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
+      enabled="true" follows="left|top" font="SansSerif"
+      handle_edit_keys_directly="true" height="20" left_delta="125"
+      max_length="50" mouse_opaque="true" name="nick01"
+      select_all_on_focus_received="true" width="160" word_wrap="false" />
+
+  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20" 
+      left="140" name="nick02_text" width="150">
+    Highlight nickname 2:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
+      enabled="true" follows="left|top" font="SansSerif"
+      handle_edit_keys_directly="true" height="20" left_delta="125"
+      max_length="50" mouse_opaque="true" name="nick02"
+      select_all_on_focus_received="true" width="160" word_wrap="false" />
+
+  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
+      left="140" name="nick03_text" width="150">
+    Highlight nickname 3:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
+      enabled="true" follows="left|top" font="SansSerif"
+      handle_edit_keys_directly="true" height="20" left_delta="125"
+      max_length="50" mouse_opaque="true" name="nick03"
+      select_all_on_focus_received="true" width="160" word_wrap="false" />
+
+</panel>