From 0de9bb9ceca63a66e396c009ed4e291d5c862de7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 24 Mar 2011 02:18:34 -0700
Subject: Added a new default font size FontSansSerifBigger and fixed
FontSansSerifBig not being named FontSansSerifLarge
---
linden/indra/llrender/llfontgl.cpp | 11 +++++++++--
linden/indra/llrender/llfontgl.h | 3 ++-
linden/indra/llui/llresmgr.cpp | 3 ++-
linden/indra/llui/llresmgr.h | 3 ++-
linden/indra/llui/llstyle.cpp | 8 ++++++--
linden/indra/newview/llconsole.cpp | 2 +-
linden/indra/newview/llgroupnotify.cpp | 2 +-
linden/indra/newview/lltexturectrl.cpp | 2 +-
linden/indra/newview/llviewerwindow.cpp | 2 +-
.../newview/skins/default/xui/en-us/floater_buy_land.xml | 6 +++---
.../newview/skins/default/xui/en-us/floater_sell_land.xml | 8 ++++----
linden/indra/newview/skins/default/xui/en-us/fonts.xml | 4 ++++
.../newview/skins/default/xui/en-us/panel_group_general.xml | 2 +-
.../skins/default/xui/en-us/panel_group_land_money.xml | 4 ++--
.../newview/skins/default/xui/en-us/panel_group_notices.xml | 6 +++---
.../newview/skins/default/xui/en-us/panel_group_roles.xml | 6 +++---
.../newview/skins/default/xui/en-us/panel_group_voting.xml | 4 ++--
17 files changed, 47 insertions(+), 29 deletions(-)
(limited to 'linden')
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 7baec81..306c6b9 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -242,7 +242,8 @@ BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
// This is primarily for error detection purposes.
succ &= (NULL != getFontSansSerifSmall());
succ &= (NULL != getFontSansSerif());
- succ &= (NULL != getFontSansSerifBig());
+ succ &= (NULL != getFontSansSerifBigger());
+ succ &= (NULL != getFontSansSerifLarge());
succ &= (NULL != getFontSansSerifHuge());
succ &= (NULL != getFontSansSerifBold());
succ &= (NULL != getFontMonospace());
@@ -313,7 +314,13 @@ LLFontGL* LLFontGL::getFontSansSerif()
}
//static
-LLFontGL* LLFontGL::getFontSansSerifBig()
+LLFontGL* LLFontGL::getFontSansSerifBigger()
+{
+ return getFont(LLFontDescriptor("SansSerif","Bigger",0));
+}
+
+//static
+LLFontGL* LLFontGL::getFontSansSerifLarge()
{
return getFont(LLFontDescriptor("SansSerif","Large",0));
}
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 6cb1727..e3a953b 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -233,7 +233,8 @@ public:
static LLFontGL* getFontMonospace();
static LLFontGL* getFontSansSerifSmall();
static LLFontGL* getFontSansSerif();
- static LLFontGL* getFontSansSerifBig();
+ static LLFontGL* getFontSansSerifBigger();
+ static LLFontGL* getFontSansSerifLarge();
static LLFontGL* getFontSansSerifHuge();
static LLFontGL* getFontSansSerifBold();
static LLFontGL* getFontExtChar();
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index 32d3d1f..f242f12 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -58,7 +58,8 @@ LLResMgr::LLResMgr()
mUSAFonts[ LLFONT_OCRA ] = LLFontGL::getFontMonospace();
mUSAFonts[ LLFONT_SANSSERIF ] = LLFontGL::getFontSansSerif();
mUSAFonts[ LLFONT_SANSSERIF_SMALL ] = LLFontGL::getFontSansSerifSmall();
- mUSAFonts[ LLFONT_SANSSERIF_BIG ] = LLFontGL::getFontSansSerifBig();
+ mUSAFonts[ LLFONT_SANSSERIF_BIGGER ]= LLFontGL::getFontSansSerifBigger();
+ mUSAFonts[ LLFONT_SANSSERIF_LARGE ] = LLFontGL::getFontSansSerifLarge();
mUSAFonts[ LLFONT_SMALL ] = LLFontGL::getFontMonospace();
/*
// USA Strings
diff --git a/linden/indra/llui/llresmgr.h b/linden/indra/llui/llresmgr.h
index d54505c..3008244 100644
--- a/linden/indra/llui/llresmgr.h
+++ b/linden/indra/llui/llresmgr.h
@@ -51,7 +51,8 @@ enum LLFONT_ID
LLFONT_OCRA,
LLFONT_SANSSERIF,
LLFONT_SANSSERIF_SMALL,
- LLFONT_SANSSERIF_BIG,
+ LLFONT_SANSSERIF_BIGGER,
+ LLFONT_SANSSERIF_LARGE,
LLFONT_SMALL,
LLFONT_COUNT // Number of values in this enum. Keep at end.
};
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index a716cbb..61a025e 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -128,9 +128,13 @@ void LLStyle::setFontName(const std::string& fontname)
{
mFontID = LLFONT_SMALL;
}
- else if ((fontname_lc == "sansserifbig"))
+ else if ((fontname_lc == "sansserifbigger"))
{
- mFontID = LLFONT_SANSSERIF_BIG;
+ mFontID = LLFONT_SANSSERIF_BIGGER;
+ }
+ else if ((fontname_lc == "sansserifhuge"))
+ {
+ mFontID = LLFONT_SANSSERIF_LARGE;
}
else if (fontname_lc == "small")
{
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 2379da3..2cea383 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -117,7 +117,7 @@ void LLConsole::setFontSize(S32 size_index)
}
else if (1 == size_index)
{
- mFont = LLFontGL::getFontSansSerifBig();
+ mFont = LLFontGL::getFontSansSerifLarge();
}
else
{
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 8e98cbc..81e6c21 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -186,7 +186,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
LLFontGL::getFontSansSerif(),
FALSE);
- static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifBig"));
+ static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifLarge"));
static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif"));
text->appendStyledText(subject + "\n",false,false,headerstyle);
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 38849f9..ccc3ab2 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -1514,7 +1514,7 @@ void LLTextureCtrl::draw()
(mTexturep->getDiscardLevel() != 1) &&
(mTexturep->getDiscardLevel() != 0))
{
- LLFontGL* font = LLFontGL::getFontSansSerifBig();
+ LLFontGL* font = LLFontGL::getFontSansSerifLarge();
font->renderUTF8(
mLoadingPlaceholderString, 0,
llfloor(interior.mLeft+10),
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 57580cf..6ef9982 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2178,7 +2178,7 @@ void LLViewerWindow::draw()
{
// Used for special titles such as "Second Life - Special E3 2003 Beta"
const S32 DIST_FROM_TOP = 20;
- LLFontGL::getFontSansSerifBig()->renderUTF8(
+ LLFontGL::getFontSansSerifLarge()->renderUTF8(
mOverlayTitle, 0,
llround( getWindowWidth() * 0.5f),
getWindowHeight() - DIST_FROM_TOP,
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index 3370ea8..47638d5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -117,7 +117,7 @@ sold with objects
+ name="account_action" right="438" width="218" font="SansSerifLarge" >
Upgrade you to premium membership.
+ name="land_use_action" right="438" width="218" font="SansSerifLarge" >
Increase your monthly land use fees to US$ 40/month.
+ name="purchase_action" right="438" font="SansSerifLarge" >
Pay Joe Resident L$ 4000 for the land
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index d91b5ff..3aeba26 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
@@ -27,7 +27,7 @@
+ right="-20" font="SansSerifLarge" >
Set a price:
@@ -44,7 +44,7 @@
+ right="-20" font="SansSerifLarge" >
Sell the land to:
@@ -69,7 +69,7 @@
+ name="sell_objects_label" right="-20" font="SansSerifLarge" >
Sell the objects with the land?
+ name="nag_message_label" right="-20" font="SansSerifLarge" >
REMEMBER: All sales are final.
+
Type your new group name here
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index 9341d4b..b5f7b37 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -18,7 +18,7 @@
Group Owned Land
@@ -105,7 +105,7 @@
Group [CURRENCY]
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
index bca87d9..e6d7604 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
@@ -15,7 +15,7 @@ the General tab.
Group Notices Archive
@@ -51,7 +51,7 @@ Notice lists are limited to 200 notices per group on a daily basis.
Create a Notice
@@ -115,7 +115,7 @@ and you can't send a folder.
Archived Notice
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index e5b621e..014b28d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -12,7 +12,7 @@
name="help_button" width="20" />
-
Members & Roles
@@ -24,7 +24,7 @@ easily be customized, allowing for greater organization and flexibility.
-
Roles
@@ -47,7 +47,7 @@ easily be customized, allowing for greater organization and flexibility.
-
Abilities
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
index 168b60b..64be465 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
@@ -20,7 +20,7 @@ vote on open proposals, and view old proposals.
name="help_button" width="20" />
Open Group Proposals
@@ -144,7 +144,7 @@ vote on open proposals, and view old proposals.
mouse_opaque="true" name="btn_abstain" width="63" />
Group Voting History
--
cgit v1.1