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

add menu bar background colors for new build/channel scheme

Oz Linden 2013-02-21 13:22:25 -05:00
parent 3b8092e31f
commit cf40fc0447
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
indra/newview/llviewerwindow.cpp
View File

@ -2235,29 +2235,42 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
// no l10n problem because channel is always an english string
std::string channel = LLVersionInfo::getChannel();
bool isProject = (channel.find("Project") != std::string::npos);
bool isProject = (channel.find("Project") != std::string::npos); // TBD - should be a regex
bool isBeta = (channel.find("Beta") != std::string::npos); // TBD - should be a regex
bool isTest = (channel.find("Test") != std::string::npos); // TBD - should be a regex
// god more important than project, proj more important than grid
if(god_mode && LLGridManager::getInstance()->isInProductionGrid())
if ( god_mode )
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuBarGodBgColor" );
if ( LLGridManager::getInstance()->isInProductionGrid() )
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuBarGodBgColor" );
}
else
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionGodBgColor" );
}
}
else if(god_mode && !LLGridManager::getInstance()->isInProductionGrid())
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionGodBgColor" );
}
else if (!god_mode && isProject)
else if (isBeta)
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBetaBgColor" );
}
else if (isProject)
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuBarProjectBgColor" );
}
else if(!god_mode && !LLGridManager::getInstance()->isInProductionGrid())
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
}
else
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
}
}
else if (isTest)
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuBarTestBgColor" );
}
else if(!LLGridManager::getInstance()->isInProductionGrid())
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
}
else
{
new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
}
if(gMenuBarView)
{

13
indra/newview/skins/default/colors.xml
View File

@ -98,6 +98,9 @@
<color
name="MdBlue"
value=".07 .38 .51 1" />
<color
name="DkBlue"
value=".06 .06 .3 1" />
<color
name="LtRed"
value="1 0.2 0.2 1" />
@ -107,6 +110,9 @@
<color
name="Red_80"
value="1 0 0 0.8" />
<color
name="DkRed"
value="0.3 0.06 0.06 1" />
<color
name="Green_80"
value="0 1 0 0.8" />
@ -823,10 +829,15 @@
<color
name="ChatTimestampColor"
reference="White" />
<color
name="MenuBarBetaBgColor"
reference="DkBlue" />
<color
name="MenuBarProjectBgColor"
reference="MdBlue" />
<color
name="MenuBarTestBgColor"
reference="DkRed" />
<color
name="MeshImportTableNormalColor"
value="1 1 1 1"/>