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

Add separate controls for chat console and chat window font sizes.

meow-7.2.2
Tonya Souther 2011-04-27 10:43:43 -05:00
parent d4f5a00086
commit 633dcbcd16
4 changed files with 73 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/app_settings/settings.xml
View File

@ -1952,7 +1952,7 @@
<key>ChatFontSize</key>
<map>
<key>Comment</key>
<string>Size of chat text in chat console (0 = small, 1 = big)</string>
<string>Size of chat text in chat floater (0 to 2, small to large)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -1960,6 +1960,17 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>ChatConsoleFontSize</key>
<map>
<key>Comment</key>
<string>Size of chat text in chat console (0 to 2, small to large)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>2</integer>
</map>
<key>ChatFullWidth</key>
<map>
<key>Comment</key>

2
indra/newview/llviewercontrol.cpp
View File

@ -611,7 +611,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("RenderDeferredGI")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("TextureMemory")->getSignal()->connect(boost::bind(&handleVideoMemoryChanged, _2));
gSavedSettings.getControl("AuditTexture")->getSignal()->connect(boost::bind(&handleAuditTextureChanged, _2));
gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&handleChatFontSizeChanged, _2));
gSavedSettings.getControl("ChatConsoleFontSize")->getSignal()->connect(boost::bind(&handleChatFontSizeChanged, _2));
gSavedSettings.getControl("NearbyToastLifeTime")->getSignal()->connect(boost::bind(&handleChatPersistTimeChanged, _2));
gSavedSettings.getControl("ConsoleMaxLines")->getSignal()->connect(boost::bind(&handleConsoleMaxLinesChanged, _2));
gSavedSettings.getControl("UploadBakedTexOld")->getSignal()->connect(boost::bind(&handleUploadBakedTexOldChanged, _2));

2
indra/newview/llviewerwindow.cpp
View File

@ -1609,7 +1609,7 @@ void LLViewerWindow::initBase()
cp.persist_time((F32)gSavedSettings.getS32("NearbyToastLifeTime"));
// /AO
cp.font_size_index(gSavedSettings.getS32("ChatFontSize"));
cp.font_size_index(gSavedSettings.getS32("ChatConsoleFontSize"));
cp.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
gConsole = LLUICtrlFactory::create<LLConsole>(cp);
getRootView()->addChild(gConsole);

72
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -15,18 +15,18 @@
left="30"
height="12"
name="font_size"
width="120"
width="130"
top="10">
Font size:
Chat window font size:
</text>
<radio_group
height="30"
height="20"
layout="topleft"
left="40"
left_delta="140"
control_name="ChatFontSize"
name="chat_font_size"
top_pad="0"
width="440">
top="10"
width="380">
<radio_item
height="16"
label="Small"
@ -34,26 +34,72 @@
left="0"
name="radio"
value="0"
top="10"
width="125" />
top_delta="20"
width="60" />
<radio_item
height="16"
label="Medium"
layout="topleft"
left_delta="145"
left_delta="60"
name="radio2"
value="1"
top_delta="0"
width="125" />
width="75" />
<radio_item
height="16"
label="Large"
layout="topleft"
left_delta="170"
left_delta="75"
name="radio3"
value="2"
top_delta="0"
width="125" />
width="60" />
</radio_group>
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="console_font_size"
width="130"
top="30">
Chat console font size:
</text>
<radio_group
height="20"
layout="topleft"
left_delta="140"
control_name="ChatConsoleFontSize"
name="chat_console_font_size"
top="30"
width="380">
<radio_item
height="16"
label="Small"
layout="topleft"
left="0"
name="consradio"
value="0"
top_delta="20"
width="60" />
<radio_item
height="16"
label="Medium"
layout="topleft"
left_delta="60"
name="consradio2"
value="1"
top_delta="0"
width="75" />
<radio_item
height="16"
label="Large"
layout="topleft"
left_delta="75"
name="consradio3"
value="2"
top_delta="0"
width="60" />
</radio_group>
@ -65,7 +111,7 @@
layout="topleft"
left="30"
name="CloseChatOnReturn"
top_pad="10"
top="50"
width="256" />
<check_box
control_name="PlayTypingAnim"