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

commented out starlight skin selection, changed skin an theme debug settings to prevent use of non working skin.

Tank_Master 2012-03-11 00:50:11 -08:00
parent 00eba4d2d1
commit 85d7e6ee62
11 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -995,7 +995,7 @@
<integer>1</integer>
</map>
<key>SkinCurrentTheme</key>
<key>SkinCurrentTheme2</key>
<map>
<key>Comment</key>
<string>The selected theme for the current skin.</string>
@ -12332,7 +12332,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>SkinCurrent</key>
<key>SkinCurrent2</key>
<map>
<key>Comment</key>
<string>The currently selected skin.</string>

4
indra/newview/app_settings/settings_firestorm.xml
View File

@ -71,7 +71,7 @@
<integer>0</integer>
</map>
<key>SkinCurrent</key>
<key>SkinCurrent2</key>
<map>
<key>Comment</key>
<string>The currently selected skin.</string>
@ -83,7 +83,7 @@
<string>firestorm</string>
</map>
<key>SkinCurrentTheme</key>
<key>SkinCurrentTheme2</key>
<map>
<key>Comment</key>
<string>The selected theme for the current skin.</string>

4
indra/newview/app_settings/settings_hybrid.xml
View File

@ -59,7 +59,7 @@
<integer>0</integer>
</map>
<key>SkinCurrent</key>
<key>SkinCurrent2</key>
<map>
<key>Comment</key>
<string>The currently selected skin.</string>
@ -71,7 +71,7 @@
<string>metaharper</string>
</map>
<key>SkinCurrentTheme</key>
<key>SkinCurrentTheme2</key>
<map>
<key>Comment</key>
<string>The selected theme for the current skin.</string>

4
indra/newview/app_settings/settings_phoenix.xml
View File

@ -59,7 +59,7 @@
<integer>0</integer>
</map>
<key>SkinCurrent</key>
<key>SkinCurrent2</key>
<map>
<key>Comment</key>
<string>The currently selected skin.</string>
@ -71,7 +71,7 @@
<string>vintage</string>
</map>
<key>SkinCurrentTheme</key>
<key>SkinCurrentTheme2</key>
<map>
<key>Comment</key>
<string>The selected theme for the current skin.</string>

8
indra/newview/app_settings/settings_v3.xml
View File

@ -71,7 +71,7 @@
<integer>1</integer>
</map>
<key>SkinCurrent</key>
<key>SkinCurrent2</key>
<map>
<key>Comment</key>
<string>The currently selected skin.</string>
@ -80,10 +80,10 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>starlight</string>
<string>metaharper</string>
</map>
<key>SkinCurrentTheme</key>
<key>SkinCurrentTheme2</key>
<map>
<key>Comment</key>
<string>The selected theme for the current skin.</string>
@ -92,7 +92,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>original_orange</string>
<string>modern</string>
</map>
<key>LetterKeysFocusChatBar</key>

12
indra/newview/llappviewer.cpp
View File

@ -1894,8 +1894,8 @@ bool LLAppViewer::cleanup()
LLUIColorTable::instance().saveUserSettings();
//<Firestorm Skin Cleanup>
std::string skinSaved = gSavedSettings.getString("SkinCurrent");
std::string themeSaved = gSavedSettings.getString("SkinCurrentTheme");
std::string skinSaved = gSavedSettings.getString("SkinCurrent2");
std::string themeSaved = gSavedSettings.getString("SkinCurrentTheme2");
if ((skinSaved != mCurrentSkin) || (themeSaved != mCurrentSkinTheme))
{
llinfos << "Clearing skin colors." << llendflush;
@ -2726,10 +2726,10 @@ bool LLAppViewer::initConfiguration()
}
//-TT Hacking to save the skin and theme for future use.
mCurrentSkin = gSavedSettings.getString("SkinCurrent");
mCurrentSkinTheme = gSavedSettings.getString("SkinCurrentTheme");
mCurrentSkin = gSavedSettings.getString("SkinCurrent2");
mCurrentSkinTheme = gSavedSettings.getString("SkinCurrentTheme2");
//-TT
const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent");
const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent2");
if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
{
// hack to force the skin to default.
@ -2738,7 +2738,7 @@ bool LLAppViewer::initConfiguration()
// KB: catznip viewer-skins
//gDirUtilp->setSkinFolder("default");
gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
const LLControlVariable* themefolder = gSavedSettings.getControl("SkinCurrentTheme");
const LLControlVariable* themefolder = gSavedSettings.getControl("SkinCurrentTheme2");
if ( (themefolder) && (LLStringUtil::null != skinfolder->getValue().asString()) )
gDirUtilp->setSkinThemeFolder(themefolder->getValue().asString());
}

4
indra/newview/llfloaterabout.cpp
View File

@ -243,8 +243,8 @@ LLSD LLFloaterAbout::getInfo()
info["BUILD_DATE"] = __DATE__;
info["BUILD_TIME"] = __TIME__;
info["CHANNEL"] = LLVersionInfo::getChannel();
info["SKIN"] = gSavedSettings.getString("SkinCurrent");
info["THEME"] = gSavedSettings.getString("SkinCurrentTheme");
info["SKIN"] = gSavedSettings.getString("SkinCurrent2");
info["THEME"] = gSavedSettings.getString("SkinCurrentTheme2");
//[FIRE 3113 : SJ] Added Font and fontsize to info
info["FONT"] = "Unknown Font";

48
indra/newview/llfloaterpreference.cpp
View File

@ -397,7 +397,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.ClearSettings", boost::bind(&LLFloaterPreference::onClickClearSettings, this));
mCommitCallbackRegistrar.add("Pref.Online_Notices", boost::bind(&LLFloaterPreference::onClickChatOnlineNotices, this));
sSkin = gSavedSettings.getString("SkinCurrent");
sSkin = gSavedSettings.getString("SkinCurrent2");
mCommitCallbackRegistrar.add("Pref.ClickActionChange", boost::bind(&LLFloaterPreference::onClickActionChange, this));
@ -610,7 +610,7 @@ void LLFloaterPreference::apply()
LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
/*
if (sSkin != gSavedSettings.getString("SkinCurrent"))
if (sSkin != gSavedSettings.getString("SkinCurrent2"))
{
LLNotificationsUtil::add("ChangeSkin");
refreshSkin(this);
@ -716,7 +716,7 @@ void LLFloaterPreference::cancel()
}
// reverts any changes to current skin
//gSavedSettings.setString("SkinCurrent", sSkin);
//gSavedSettings.setString("SkinCurrent2", sSkin);
if (mClickActionDirty)
{
@ -1106,20 +1106,20 @@ void LLFloaterPreference::onClickJavascript()
/*
void LLFloaterPreference::onClickSkin(LLUICtrl* ctrl, const LLSD& userdata)
{
gSavedSettings.setString("SkinCurrent", userdata.asString());
gSavedSettings.setString("SkinCurrent2", userdata.asString());
ctrl->setValue(userdata.asString());
}
void LLFloaterPreference::onSelectSkin()
{
std::string skin_selection = getChild<LLRadioGroup>("skin_selection")->getValue().asString();
gSavedSettings.setString("SkinCurrent", skin_selection);
gSavedSettings.setString("SkinCurrent2", skin_selection);
}
void LLFloaterPreference::refreshSkin(void* data)
{
LLPanel*self = (LLPanel*)data;
sSkin = gSavedSettings.getString("SkinCurrent");
sSkin = gSavedSettings.getString("SkinCurrent2");
self->getChild<LLRadioGroup>("skin_selection", true)->setValue(sSkin);
}
*/
@ -1919,7 +1919,7 @@ BOOL LLPanelPreference::postBuild()
// if skin is set to a skin that no longer exists (silver) set back to default
if (getChild<LLRadioGroup>("skin_selection")->getSelectedIndex() < 0)
{
gSavedSettings.setString("SkinCurrent", "default");
gSavedSettings.setString("SkinCurrent2", "default");
LLFloaterPreference::refreshSkin(this);
}
@ -2471,8 +2471,8 @@ static LLRegisterPanelClassWrapper<LLPanelPreferenceSkins> t_pref_skins("panel_p
LLPanelPreferenceSkins::LLPanelPreferenceSkins() : LLPanelPreference(), m_pSkinCombo(NULL), m_pSkinThemeCombo(NULL)
{
m_Skin = gSavedSettings.getString("SkinCurrent");
m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme");
m_Skin = gSavedSettings.getString("SkinCurrent2");
m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme2");
const std::string strSkinsPath = gDirUtilp->getSkinBaseDir() + gDirUtilp->getDirDelimiter() + "skins.xml";
llifstream fileSkins(strSkinsPath, std::ios::binary);
if (fileSkins.is_open())
@ -2500,10 +2500,10 @@ BOOL LLPanelPreferenceSkins::postBuild()
void LLPanelPreferenceSkins::apply()
{
if ( (m_Skin != gSavedSettings.getString("SkinCurrent")) || (m_SkinTheme != gSavedSettings.getString("SkinCurrentTheme")) )
if ( (m_Skin != gSavedSettings.getString("SkinCurrent2")) || (m_SkinTheme != gSavedSettings.getString("SkinCurrentTheme2")) )
{
gSavedSettings.setString("SkinCurrent", m_Skin);
gSavedSettings.setString("SkinCurrentTheme", m_SkinTheme);
gSavedSettings.setString("SkinCurrent2", m_Skin);
gSavedSettings.setString("SkinCurrentTheme2", m_SkinTheme);
LLNotificationsUtil::add("ChangeSkin");
@ -2513,8 +2513,8 @@ void LLPanelPreferenceSkins::apply()
void LLPanelPreferenceSkins::cancel()
{
m_Skin = gSavedSettings.getString("SkinCurrent");
m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme");
m_Skin = gSavedSettings.getString("SkinCurrent2");
m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme2");
refreshSkinList();
}
@ -2526,16 +2526,16 @@ void LLPanelPreferenceSkins::onSkinChanged()
onSkinThemeChanged(); // make sure we initialize a theme for our new skin
//AO: Some crude hardcoded preferences per skin. We will remove these and replace them with "basic mode"-style behaviors in the 2.6 mergeup
if (m_Skin.compare("starlight") == 0)
{
gSavedSettings.setBOOL("ShowMenuBarLocation", FALSE);
gSavedSettings.setBOOL("ShowNavbarNavigationPanel",TRUE);
}
else
{
gSavedSettings.setBOOL("ShowMenuBarLocation", TRUE);
gSavedSettings.setBOOL("ShowNavbarNavigationPanel",FALSE);
}
//if (m_Skin.compare("starlight") == 0)
//{
// gSavedSettings.setBOOL("ShowMenuBarLocation", FALSE);
// gSavedSettings.setBOOL("ShowNavbarNavigationPanel",TRUE);
//}
//else
//{
// gSavedSettings.setBOOL("ShowMenuBarLocation", TRUE);
// gSavedSettings.setBOOL("ShowNavbarNavigationPanel",FALSE);
//}
}

2
indra/newview/llviewermedia.cpp
View File

@ -542,7 +542,7 @@ std::string LLViewerMedia::getCurrentUserAgent()
{
// Don't use user-visible string to avoid
// punctuation and strange characters.
std::string skin_name = gSavedSettings.getString("SkinCurrent");
std::string skin_name = gSavedSettings.getString("SkinCurrent2");
// Just in case we need to check browser differences in A/B test
// builds.

2
indra/newview/llviewermedia.h
View File

@ -299,7 +299,7 @@ public:
// switch skins without restarting the app.
static void updateBrowserUserAgent();
// Callback for when the SkinCurrent control is changed to
// Callback for when the SkinCurrent2 control is changed to
// switch the user agent string to indicate the new skin.
static bool handleSkinCurrentChanged(const LLSD& newvalue);

6
indra/newview/skins/skins.xml
View File

@ -73,7 +73,7 @@
</map>
</array>
</map>
<!--removed do to skin not working
<map>
<key>name</key>
<string>StarLight</string>
@ -93,7 +93,7 @@
<key>folder</key>
<string>original_teal</string>
</map>
<map>
<map>
<key>name</key>
<string>Mono Teal</string>
<key>folder</key>
@ -119,7 +119,7 @@
</map>
</array>
</map>
</map> -->
</array>
</llsd>