chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Changed @include behavior. Now the sections that the included file has are inserted to the position where the @include is defined.

Browse Source 
http://rainmeter.net/forum/viewtopic.php?f=14&t=10500
This commit is contained in:
spx 2012-07-18 03:41:58 -07:00
parent ffbdcbf65a
commit 720ed170f0
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/ConfigParser.cpp
View File

@ -65,6 +65,7 @@ void CConfigParser::Initialize(const std::wstring& filename, CMeterWindow* meter
m_LastValueDefined = false; m_LastValueDefined = false;
m_CurrentSection = NULL; m_CurrentSection = NULL;
m_SectionInsertPos = m_Sections.end();
// Set the built-in variables. Do this before the ini file is read so that the paths can be used with @include // Set the built-in variables. Do this before the ini file is read so that the paths can be used with @include
SetBuiltInVariables(filename, resourcePath, meterWindow); SetBuiltInVariables(filename, resourcePath, meterWindow);
@ -78,6 +79,7 @@ void CConfigParser::Initialize(const std::wstring& filename, CMeterWindow* meter
// Clear and minimize // Clear and minimize
m_FoundSections.clear(); m_FoundSections.clear();
m_ListVariables.clear(); m_ListVariables.clear();
m_SectionInsertPos = m_Sections.end();
} }
void CConfigParser::SetBuiltInVariables(const std::wstring& filename, const std::wstring* resourcePath, CMeterWindow* meterWindow) void CConfigParser::SetBuiltInVariables(const std::wstring& filename, const std::wstring* resourcePath, CMeterWindow* meterWindow)
@ -1229,7 +1231,7 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile, LPCTSTR skinSection
{ {
if (m_FoundSections.insert(key).second) if (m_FoundSections.insert(key).second)
{ {
m_Sections.push_back(value); m_Sections.insert(m_SectionInsertPos, value);
} }
sections.push_back(value); sections.push_back(value);
} }
@ -1266,6 +1268,7 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile, LPCTSTR skinSection
const WCHAR* sectionName = (*iter).c_str(); const WCHAR* sectionName = (*iter).c_str();
bool isVariables = (_wcsicmp(sectionName, L"Variables") == 0); bool isVariables = (_wcsicmp(sectionName, L"Variables") == 0);
bool isMetadata = (skinSection == NULL && !isVariables && _wcsicmp(sectionName, L"Metadata") == 0); bool isMetadata = (skinSection == NULL && !isVariables && _wcsicmp(sectionName, L"Metadata") == 0);
bool resetInsertPos = true;
// Read all "key=value" from the section // Read all "key=value" from the section
do do
@ -1320,6 +1323,20 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile, LPCTSTR skinSection
// Relative to the ini folder // Relative to the ini folder
value.insert(0, CRainmeter::ExtractPath(iniFile)); value.insert(0, CRainmeter::ExtractPath(iniFile));
} }
if (resetInsertPos)
{
for (auto it = m_Sections.cbegin(); it != m_Sections.cend(); ++it)
{
if (_wcsicmp((*it).c_str(), sectionName) == 0)
{
m_SectionInsertPos = ++it;
resetInsertPos = false;
break;
}
}
}
ReadIniFile(value, skinSection, depth + 1); ReadIniFile(value, skinSection, depth + 1);
} }
} }

1
Library/ConfigParser.h
View File

@ -135,6 +135,7 @@ private:
std::unordered_set<std::wstring> m_FoundSections; std::unordered_set<std::wstring> m_FoundSections;
std::list<std::wstring> m_ListVariables; std::list<std::wstring> m_ListVariables;
std::list<std::wstring>::const_iterator m_SectionInsertPos;
std::unordered_map<std::wstring, std::wstring> m_BuiltInVariables; std::unordered_map<std::wstring, std::wstring> m_BuiltInVariables;
std::unordered_map<std::wstring, std::wstring> m_Variables; std::unordered_map<std::wstring, std::wstring> m_Variables;