Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=11361
This commit is contained in:
Rom Walton 2006-10-25 23:17:47 +00:00
parent 86b41de505
commit 9f57708ac8
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
clientgui/SkinManager.cpp
View File

@ -1218,31 +1218,25 @@ CSkinManager::~CSkinManager() {
} }
bool CSkinManager::ReloadSkin(wxLocale* pLocale, wxString strSkin) { bool CSkinManager::ReloadSkin(wxLocale* pLocale, wxString strSkin) {
m_strSelectedSkin = strSkin;
// Check to see if the skin we want to change to is the default skin
if (GetDefaultSkinName() == m_strSelectedSkin) {
// Clear out all the old stuff and just run the skin validation
// code to load up the default resources
Clear();
// Set the default skin back to Default
m_strSelectedSkin = strSkin;
// Validate settings
ValidateSkin();
return true;
}
// Okay, this means we should go hit the disk to actually load up the
// skin and resources.
//
int retval; int retval;
FILE* p; FILE* p;
MIOFILE mf; MIOFILE mf;
wxString strDesiredLocale = pLocale->GetCanonicalName(); wxString strDesiredLocale = pLocale->GetCanonicalName();
// Clear out all the old stuff
Clear();
// Set the default skin back to Default
m_strSelectedSkin = strSkin;
// Check to see if the skin we want to change to is the default skin
if (GetDefaultSkinName() == m_strSelectedSkin) {
// Validate settings
ValidateSkin();
return true;
}
// First we try the users canonical locale resources. // First we try the users canonical locale resources.
// i.e. en_US // i.e. en_US
retval = ERR_XML_PARSE; retval = ERR_XML_PARSE;