livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1095

master
Oz Linden 2011-04-21 20:23:26 -04:00
parent 79dceafdfd 7577ec25a0
commit b15dca2263
6 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -424,6 +424,7 @@ Jonathan Yap
STORM-1094
STORM-1077
STORM-953
STORM-1095
Kage Pixel
VWR-11
Ken March
@ -660,6 +661,7 @@ Robin Cornelius
STORM-422
STORM-960
STORM-1019
STORM-1095
VWR-2488
VWR-9557
VWR-10579

2
indra/newview/llfloaterpreference.cpp
View File

@ -411,6 +411,8 @@ BOOL LLFloaterPreference::postBuild()
gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLNearbyChat::processChatHistoryStyleUpdate, _2));
gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLViewerChat::signalChatFontChanged));
gSavedSettings.getControl("ChatBubbleOpacity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onNameTagOpacityChange, this, _2));
LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");

14
indra/newview/llnearbychatbar.cpp
View File

@ -47,6 +47,7 @@
#include "llwindow.h"
#include "llviewerwindow.h"
#include "llrootview.h"
#include "llviewerchat.h"
S32 LLNearbyChatBar::sLastSpecialChatChannel = 0;
@ -433,13 +434,26 @@ BOOL LLNearbyChatBar::postBuild()
mChatBox->setPassDelete(TRUE);
mChatBox->setReplaceNewlinesWithSpaces(FALSE);
mChatBox->setEnableLineHistory(TRUE);
mChatBox->setFont(LLViewerChat::getChatFont());
mOutputMonitor = getChild<LLOutputMonitorCtrl>("chat_zone_indicator");
mOutputMonitor->setVisible(FALSE);
// Register for font change notifications
LLViewerChat::setFontChangedCallback(boost::bind(&LLNearbyChatBar::onChatFontChange, this, _1));
return TRUE;
}
void LLNearbyChatBar::onChatFontChange(LLFontGL* fontp)
{
// Update things with the new font whohoo
if (mChatBox)
{
mChatBox->setFont(fontp);
}
}
//static
LLNearbyChatBar* LLNearbyChatBar::getInstance()
{

1
indra/newview/llnearbychatbar.h
View File

@ -127,6 +127,7 @@ protected:
void sendChat( EChatType type );
void onChatBoxCommit();
void onChatFontChange(LLFontGL* fontp);
static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
EChatType processChatTypeTriggers(EChatType type, std::string &str);

14
indra/newview/llviewerchat.cpp
View File

@ -36,6 +36,7 @@
#include "llinstantmessage.h" //SYSTEM_FROM
// LLViewerChat
LLViewerChat::font_change_signal_t LLViewerChat::sChatFontChangedSignal;
//static
void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color)
@ -256,3 +257,16 @@ std::string LLViewerChat::getObjectImSLURL(const LLChat& chat, const LLSD& args)
return url;
}
//static
boost::signals2::connection LLViewerChat::setFontChangedCallback(const font_change_signal_t::slot_type& cb)
{
return sChatFontChangedSignal.connect(cb);
}
//static
void LLViewerChat::signalChatFontChanged()
{
// Notify all observers that our font has changed
sChatFontChangedSignal(getChatFont());
}

6
indra/newview/llviewerchat.h
View File

@ -35,6 +35,8 @@
class LLViewerChat
{
public:
typedef boost::signals2::signal<void (LLFontGL*)> font_change_signal_t;
static void getChatColor(const LLChat& chat, LLColor4& r_color);
static void getChatColor(const LLChat& chat, std::string& r_color_name, F32& r_color_alpha);
static LLFontGL* getChatFont();
@ -42,8 +44,12 @@ public:
static void formatChatMsg(const LLChat& chat, std::string& formated_msg);
static std::string getSenderSLURL(const LLChat& chat, const LLSD& args);
static boost::signals2::connection setFontChangedCallback(const font_change_signal_t::slot_type& cb);
static void signalChatFontChanged();
private:
static std::string getObjectImSLURL(const LLChat& chat, const LLSD& args);
static font_change_signal_t sChatFontChangedSignal;
};