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

Reverting faulty "option to display group chats, IM sessions and nearby chat always in uppercase" (58312a3a514f) because of the links/slurls breaking and implementing experimental all-caps Deja Vu font variant instead 

Chooseing this font in selector would also turn not only chats, but all other strings in the viewer uppercase (UI, hovertext etc.)
Northspring 2014-09-06 19:02:34 +02:00
parent 28f1560614
commit 06454bc5da
17 changed files with 184 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20841,17 +20841,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<real>2.0</real>
</map>
<key>FSChatsUppercase</key>
<map>
<key>Comment</key>
<string>Group chats, IM sessions and nearby chat always in uppercase.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>OpenRegionSettingsEnableDrawDistance</key>
<map>
<key>Comment</key>

BIN
indra/newview/fonts/DejaVuSansAllCaps-Bold.ttf Normal file
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSansAllCaps-BoldOblique.ttf Normal file
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSansAllCaps-Oblique.ttf Normal file
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSansAllCaps.ttf Normal file
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSansAllCapsMono.ttf Normal file
View File

Binary file not shown.

181
indra/newview/fonts/fonts_deja_vu_all_caps.xml Normal file
View File

@ -0,0 +1,181 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<fonts>
<font name="default" comment="default font files (global fallbacks)">
<file>DejaVuSansAllCaps.ttf</file>
<os name="Windows">
<file>MSGOTHIC.TTC</file>
<file>gulim.ttc</file>
<file>simhei.ttf</file>
<file>ArialUni.ttf</file>
<file>seguisym.ttf</file>
</os>
<os name="Mac">
<file>ヒラギノ角ゴ Pro W3.otf</file>
<file>ヒラギノ角ゴ ProN W3.otf</file>
<file>AppleSDGothicNeo-Regular.otf</file>
<file>AppleGothic.dfont</file>
<file>AppleGothic.ttf</file>
<file>华文细黑.ttf</file>
</os>
</font>
<font name="SansSerifBold"
comment="Name of bold sans-serif font">
<file>DejaVuSansAllCaps-Bold.ttf</file>
<os name="Windows">
<file>arialbd.ttf</file>
</os>
<os name="Mac">
<file>Helvetica.dfont</file>
</os>
</font>
<font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
<file>DejaVuSansAllCaps.ttf</file>
<os name="Windows">
<file>arial.ttf</file>
</os>
<os name="Mac">
<file>Helvetica.dfont</file>
</os>
</font>
<font name="SansSerif"
comment="Name of bold sans-serif font"
font_style="BOLD">
<file>DejaVuSansAllCaps-Bold.ttf</file>
</font>
<font name="SansSerif"
comment="Name of italic sans-serif font"
font_style="ITALIC">
<file>DejaVuSansAllCaps-Oblique.ttf</file>
</font>
<font name="SansSerif"
comment="Name of bold italic sans-serif font"
font_style="BOLD|ITALIC">
<file>DejaVuSansAllCaps-BoldOblique.ttf</file>
</font>
<font name="Monospace"
comment="Name of monospace font">
<file>DejaVuSansAllCapsMono.ttf</file>
</font>
<font name="Scripting"
comment="Name of an optional font used for the script editor">
<file>SourceCodePro-Regular.ttf</file>
</font>
<font name="OCRA"
comment="OCRA machine character recognition used in script editor compile errors">
<file>ocra.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font">
<file>DejaVuSansAllCaps.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font (bold)"
font_style="BOLD">
<file>DejaVuSansAllCaps-Bold.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font (italic)"
font_style="ITALIC">
<file>DejaVuSansAllCaps-Oblique.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font (bold italic)"
font_style="BOLD|ITALIC">
<file>DejaVuSansAllCaps-BoldOblique.ttf</file>
</font>
<font name="Helvetica"
comment="Name of Helvetica font">
<file>DejaVuSansAllCaps.ttf</file>
<os name="Windows">
<file>arial.ttf</file>
</os>
<os name="Mac">
<file>arial.ttf</file>
</os>
</font>
<font name="Helvetica"
comment="Name of Helvetica font (bold)"
font_style="BOLD">
<file>DejaVuSansAllCaps-Bold.ttf</file>
<os name="Windows">
<file>arialbd.ttf</file>
</os>
<os name="Mac">
<file>arialbd.ttf</file>
</os>
</font>
<font name="Helvetica"
comment="Name of Helvetica font (italic)"
font_style="ITALIC">
<file>DejaVuSansAllCaps-Oblique.ttf</file>
<os name="Windows">
<file>ariali.ttf</file>
</os>
<os name="Mac">
<file>ariali.ttf</file>
</os>
</font>
<font name="Helvetica"
comment="Name of Helvetica font (bold italic)"
font_style="BOLD|ITALIC">
<file>DejaVuSans-BoldOblique.ttf</file>
<os name="Windows">
<file>arialbi.ttf</file>
</os>
<os name="Mac">
<file>arialbi.ttf</file>
</os>
</font>
<font name="OverrideTest"
comment="Name of font to test overriding">
<file>times.ttf</file>
<file>DejaVuSansAllCaps.ttf</file>
</font>
<font_size name="Scripting"
comment="Size of script editor font (points, or 1/72 of an inch)"
size="9.6"
/>
<font_size name="Monospace"
comment="Size for monospaced font (points, or 1/72 of an inch)"
size="8.0"
/>
<font_size name="Huge"
comment="Size of huge font (points, or 1/72 of an inch)"
size="16.0"
/>
<font_size name="Large"
comment="Size of large font (points, or 1/72 of an inch)"
size="10.6"
/>
<font_size name="Medium"
comment="Size of medium font (points, or 1/72 of an inch)"
size="8.6"
/>
<font_size name="Small"
comment="Size of small font (points, or 1/72 of an inch)"
size="7.6"
/>
<font_size name="Pie"
comment="Size of pie menu font (points, or 1/72 of an inch)"
size="7.3"
/>
</fonts>

11
indra/newview/fschathistory.cpp
View File

@ -971,8 +971,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
// FS:LO FIRE-2899 - Faded text for IMs in nearby chat
//IRC styled /me messages.
bool irc_me = (prefix == "/me " || prefix == "/me'"
|| prefix == "/ME " || prefix == "/ME'"); // <FS>
bool irc_me = (prefix == "/me " || prefix == "/me'");
// Delimiter after a name in header copy/past and in plain text mode
std::string delimiter = ": ";
@ -1290,14 +1289,6 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
}
// FS:LO FIRE-2899 - Faded text for IMs in nearby chat
// <FS:PP> FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase
static LLCachedControl<bool> sFSChatsUppercase(gSavedSettings, "FSChatsUppercase");
if (sFSChatsUppercase)
{
LLStringUtil::toUpper(message);
LLStringUtil::toUpper(mLastFromName);
}
// </FS:PP>
if (square_brackets)
{
message += "]";

1
indra/newview/llappviewer.cpp
View File

@ -3858,6 +3858,7 @@ LLSD LLAppViewer::getViewerInfo() const
else if (fsInternalFontSettingsFile == "fonts_mobi.xml") info["FONT"] = "Mobi Sans";
else if (fsInternalFontSettingsFile == "fonts_roboto.xml") info["FONT"] = "Roboto";
else if (fsInternalFontSettingsFile == "fonts_dyslexia.xml") info["FONT"] = "OpenDyslexic";
else if (fsInternalFontSettingsFile == "fonts_deja_vu_all_caps.xml") info["FONT"] = "Deja Vu All Caps";
info["FONT_SIZE"] = gSavedSettings.getF32("FSFontSizeAdjustment");
info["FONT_SCREEN_DPI"] = gSavedSettings.getF32("FontScreenDPI");

8
indra/newview/llcallingcard.cpp
View File

@ -837,14 +837,6 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
std::string notify_msg = notification->getMessage();
// <FS:PP> FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase
static LLCachedControl<bool> oFSChatsUppercase(gSavedSettings, "FSChatsUppercase");
if (oFSChatsUppercase)
{
LLStringUtil::toUpper(notify_msg);
}
// </FS:PP>
LLIMModel::instance().proccessOnlineOfflineNotification(session_id, notify_msg);
// If desired, also send it to nearby chat, this allows friends'
// online/offline times to be referenced in chat & logged.

25
indra/newview/llviewermessage.cpp
View File

@ -4470,10 +4470,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
}
return;
}
// <FS:PP> FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase
static LLCachedControl<bool> aFSChatsUppercase(gSavedSettings, "FSChatsUppercase");
bool allowConvertChatUppercase = true;
// </FS:PP>
// Look for IRC-style emotes
if (ircstyle)
@ -4507,7 +4503,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
{
mesg.erase(0, 1);
LLStringUtil::toLower(mesg);
allowConvertChatUppercase = false;
std::string strExecuted, strFailed, strRetained, *pstr;
@ -4584,7 +4579,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
if ( (rlv_handler_t::isEnabled()) && (chatter) && (chat.mSourceType == CHAT_SOURCE_OBJECT) &&
(gSavedSettings.getBOOL("EffectScriptChatParticles")) )
{
allowConvertChatUppercase = false;
LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
psc->setSourceObject(chatter);
psc->setColor(color);
@ -4604,25 +4598,14 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
case CHAT_TYPE_START:
case CHAT_TYPE_STOP:
LL_WARNS("Messaging") << "Got chat type start/stop in main chat processing." << LL_ENDL;
allowConvertChatUppercase = false;
break;
default:
LL_WARNS("Messaging") << "Unknown type " << chat.mChatType << " in chat!" << LL_ENDL;
allowConvertChatUppercase = false;
break;
}
chat.mText += mesg;
}
// <FS:PP> FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase
if (aFSChatsUppercase && allowConvertChatUppercase)
{
std::string chatMessageUppercase = chat.mText;
LLStringUtil::toUpper(chatMessageUppercase);
chat.mText = chatMessageUppercase;
}
// </FS:PP>
// We have a real utterance now, so can stop showing "..." and proceed.
if (chatter && chatter->isAvatar())
@ -4637,14 +4620,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
LLViewerChat::formatChatMsg(chat, formated_msg);
LLChat chat_bubble = chat;
// <FS:PP> FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase
// Chat bubbles
if (aFSChatsUppercase && allowConvertChatUppercase)
{
LLStringUtil::toUpper(formated_msg);
}
// </FS:PP>
chat_bubble.mText = formated_msg;
((LLVOAvatar*)chatter)->addChat(chat_bubble);
}

1
indra/newview/skins/default/xui/de/panel_preferences_chat.xml
View File

@ -20,7 +20,6 @@
<radio_item label="Groß" name="consradio3"/>
<radio_item label="Riesig" name="consradio4"/>
</radio_group>
<check_box label="Gruppenchats, IM-Sitzungen und Chat in der Nähe immer in Großbuchstaben anzeigen" name="chat_always_in_uppercase"/>
<check_box label="Chateingabe nach Drücken der Returntaste beenden" name="CloseChatOnReturn"/>
<check_box label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
<check_box label="Beim Chatten Avataranimation abspielen, z.B. für Rufen" name="play_avatar_animations"/>

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

@ -143,21 +143,13 @@
width="60" />
</radio_group>
<check_box
control_name="FSChatsUppercase"
height="16"
label="Always display group chats, IM sessions and nearby chat in uppercase"
layout="topleft"
left="20"
name="chat_always_in_uppercase"
top_pad="1"
width="400" />
<check_box
control_name="PlayTypingAnim"
height="16"
initial_value="true"
label="Play typing animation when chatting"
layout="topleft"
left="20"
name="play_typing_animation"
top_pad="1"
width="400" />

1
indra/newview/skins/default/xui/es/panel_preferences_chat.xml
View File

@ -20,7 +20,6 @@
<radio_item label="Grande" name="consradio3"/>
<radio_item label="Enorme" name="consradio4"/>
</radio_group>
<check_box label="Mostrar chats de grupo, local y sesiones de MI siempre en mayúsculas" name="chat_always_in_uppercase"/>
<check_box label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
<check_box label="Ejecutar animaciones del avatar (como gritar)" name="play_avatar_animations"/>
<check_box label="Reproducir sonido de tecleo cuando alguien escribe en el chat local" name="play_typing_sound"/>

8
indra/newview/skins/default/xui/ja/panel_preferences_UI.xml
View File

@ -152,14 +152,6 @@
<text name="tooltip_textbox1">
フォント種類：
</text>
<combo_box name="Fontsettingsfile">
<combo_box.item label="Deja Vu" name="tt_item1" value="fonts.xml" />
<combo_box.item label="Ubuntuフォントファミリー" name="tt_item2" value="fonts_ubuntu.xml" />
<combo_box.item label="Liberation" name="tt_item3" value="fonts_liberation.xml" />
<combo_box.item label="Droid Sans" name="tt_item4" value="fonts_droid.xml" />
<combo_box.item label="Mobi Sans" name="tt_item5" value="fonts_mobi.xml" />
<combo_box.item label="Roboto" name="tt_item6" value="fonts_roboto.xml" />
</combo_box>
<text name="tooltip_textbox2">
（再起動が必要）
</text>

1
indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
View File

@ -21,7 +21,6 @@
<radio_item label="大" name="consradio3" value="2"/>
</radio_group>
<check_box label="グループチャット、IM、周辺チャットを常に大文字で表示する" name="chat_always_in_uppercase" />
<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
<check_box label="アバターのアニメを再生（叫ぶ時など）" name="play_avatar_animations"/>
<check_box label="人が会話している時にタイピング音が聞こえるようにする" name="play_typing_sound"/>

1
indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
View File

@ -20,7 +20,6 @@
<radio_item label="Duża" name="consradio3"/>
<radio_item label="Ogromna" name="consradio4"/>
</radio_group>
<check_box label="Wyświetlaj czaty grupowe, wiadomości IM oraz czat lokalny zawsze dużymi literami" name="chat_always_in_uppercase"/>
<check_box label="Używaj animacji podczas pisania" name="play_typing_animation"/>
<check_box label="Odtwarzaj animacje awatara (np. krzyczenie)" name="play_avatar_animations"/>
<check_box label="Dźwięk pisania, gdy inne osoby piszą w czacie lokalnym" name="play_typing_sound"/>