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

Previous beta changed everything to be case sensitive. Fixed.

Browse Source
This commit is contained in:
Kimmo Pekkola 2009-08-27 15:42:24 +00:00
parent ffdec7be65
commit f5f257a595
3 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Library/ConfigParser.cpp
View File

@ -23,6 +23,7 @@
#include "Litestep.h" #include "Litestep.h"
#include "Rainmeter.h" #include "Rainmeter.h"
#include <TCHAR.H> #include <TCHAR.H>
#include <algorithm>
extern CRainmeter* Rainmeter; extern CRainmeter* Rainmeter;
@ -67,29 +68,29 @@ void CConfigParser::Initialize(LPCTSTR filename, CRainmeter* pRainmeter)
// Set the default variables // Set the default variables
if (pRainmeter) if (pRainmeter)
{ {
m_Variables[L"PROGRAMPATH"] = pRainmeter->GetPath(); SetVariable(L"PROGRAMPATH", pRainmeter->GetPath());
m_Variables[L"SETTINGSPATH"] = pRainmeter->GetSettingsPath(); SetVariable(L"SETTINGSPATH", pRainmeter->GetSettingsPath());
m_Variables[L"SKINSPATH"] = pRainmeter->GetSkinPath(); SetVariable(L"SKINSPATH", pRainmeter->GetSkinPath());
m_Variables[L"PLUGINSPATH"] = pRainmeter->GetPluginPath(); SetVariable(L"PLUGINSPATH", pRainmeter->GetPluginPath());
m_Variables[L"CURRENTPATH"] = CRainmeter::ExtractPath(filename); SetVariable(L"CURRENTPATH", CRainmeter::ExtractPath(filename));
m_Variables[L"ADDONSPATH"] = pRainmeter->GetPath() + L"Addons\\"; SetVariable(L"ADDONSPATH", pRainmeter->GetPath() + L"Addons\\");
RECT workArea; RECT workArea;
SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0); SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0);
TCHAR buffer[256]; TCHAR buffer[256];
swprintf(buffer, L"%i", workArea.left); swprintf(buffer, L"%i", workArea.left);
m_Variables[L"WORKAREAX"] = buffer; SetVariable(L"WORKAREAX", buffer);
swprintf(buffer, L"%i", workArea.top); swprintf(buffer, L"%i", workArea.top);
m_Variables[L"WORKAREAY"] = buffer; SetVariable(L"WORKAREAY", buffer);
swprintf(buffer, L"%i", workArea.right - workArea.left); swprintf(buffer, L"%i", workArea.right - workArea.left);
m_Variables[L"WORKAREAWIDTH"] = buffer; SetVariable(L"WORKAREAWIDTH", buffer);
swprintf(buffer, L"%i", workArea.bottom - workArea.top); swprintf(buffer, L"%i", workArea.bottom - workArea.top);
m_Variables[L"WORKAREAHEIGHT"] = buffer; SetVariable(L"WORKAREAHEIGHT", buffer);
swprintf(buffer, L"%i", GetSystemMetrics(SM_CXSCREEN)); swprintf(buffer, L"%i", GetSystemMetrics(SM_CXSCREEN));
m_Variables[L"SCREENAREAWIDTH"] = buffer; SetVariable(L"SCREENAREAWIDTH", buffer);
swprintf(buffer, L"%i", GetSystemMetrics(SM_CYSCREEN)); swprintf(buffer, L"%i", GetSystemMetrics(SM_CYSCREEN));
m_Variables[L"SCREENAREAHEIGHT"] = buffer; SetVariable(L"SCREENAREAHEIGHT", buffer);
} }
ReadVariables(); ReadVariables();
@ -106,7 +107,7 @@ void CConfigParser::ReadVariables()
for (size_t i = 0; i < listVariables.size(); i++) for (size_t i = 0; i < listVariables.size(); i++)
{ {
m_Variables[listVariables[i]] = GetValue(L"Variables", listVariables[i], L""); SetVariable(listVariables[i], GetValue(L"Variables", listVariables[i], L""));
} }
} }
@ -121,7 +122,9 @@ void CConfigParser::ReadVariables()
*/ */
void CConfigParser::SetVariable(const std::wstring& strVariable, const std::wstring& strValue) void CConfigParser::SetVariable(const std::wstring& strVariable, const std::wstring& strValue)
{ {
m_Variables[strVariable] = strValue; std::wstring strTmp(strVariable);
std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
m_Variables[strTmp] = strValue;
} }
/* /*
@ -168,9 +171,10 @@ const std::wstring& CConfigParser::ReadString(LPCTSTR section, LPCTSTR key, LPCT
size_t end = result.find(L'#', pos + 1); size_t end = result.find(L'#', pos + 1);
if (end != std::wstring::npos) if (end != std::wstring::npos)
{ {
std::wstring var(result.begin() + pos + 1, result.begin() + end); std::wstring strTmp(result.begin() + pos + 1, result.begin() + end);
std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
std::map<std::wstring, std::wstring>::iterator iter = m_Variables.find(var); std::map<std::wstring, std::wstring>::iterator iter = m_Variables.find(strTmp);
if (iter != m_Variables.end()) if (iter != m_Variables.end())
{ {
// Variable found, replace it with the value // Variable found, replace it with the value
@ -452,7 +456,10 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
WCHAR* pos = items; WCHAR* pos = items;
while(wcslen(pos) > 0) while(wcslen(pos) > 0)
{ {
m_Keys[pos] = std::vector<std::wstring>(); std::wstring strTmp(pos);
std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
m_Keys[strTmp] = std::vector<std::wstring>();
pos = pos + wcslen(pos) + 1; pos = pos + wcslen(pos) + 1;
} }
@ -509,13 +516,18 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
*/ */
void CConfigParser::SetValue(const std::wstring& strSection, const std::wstring& strKey, const std::wstring& strValue) void CConfigParser::SetValue(const std::wstring& strSection, const std::wstring& strKey, const std::wstring& strValue)
{ {
stdext::hash_map<std::wstring, std::vector<std::wstring> >::iterator iter = m_Keys.find(strSection); std::wstring strTmpSection(strSection);
std::wstring strTmpKey(strKey);
std::transform(strTmpSection.begin(), strTmpSection.end(), strTmpSection.begin(), ::tolower);
std::transform(strTmpKey.begin(), strTmpKey.end(), strTmpKey.begin(), ::tolower);
stdext::hash_map<std::wstring, std::vector<std::wstring> >::iterator iter = m_Keys.find(strTmpSection);
if (iter != m_Keys.end()) if (iter != m_Keys.end())
{ {
std::vector<std::wstring>& array = (*iter).second; std::vector<std::wstring>& array = (*iter).second;
array.push_back(strKey); array.push_back(strTmpKey);
} }
m_Values[strSection + L"::" + strKey] = strValue; m_Values[strTmpSection + L"::" + strTmpKey] = strValue;
} }
//============================================================================== //==============================================================================
@ -529,7 +541,10 @@ void CConfigParser::SetValue(const std::wstring& strSection, const std::wstring&
*/ */
const std::wstring& CConfigParser::GetValue(const std::wstring& strSection, const std::wstring& strKey, const std::wstring& strDefault) const std::wstring& CConfigParser::GetValue(const std::wstring& strSection, const std::wstring& strKey, const std::wstring& strDefault)
{ {
stdext::hash_map<std::wstring, std::wstring>::iterator iter = m_Values.find(strSection + L"::" + strKey); std::wstring strTmp(strSection + L"::" + strKey);
std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
stdext::hash_map<std::wstring, std::wstring>::iterator iter = m_Values.find(strTmp);
if (iter != m_Values.end()) if (iter != m_Values.end())
{ {
return (*iter).second; return (*iter).second;
@ -566,7 +581,10 @@ std::vector<std::wstring> CConfigParser::GetSections()
*/ */
std::vector<std::wstring> CConfigParser::GetKeys(const std::wstring& strSection) std::vector<std::wstring> CConfigParser::GetKeys(const std::wstring& strSection)
{ {
stdext::hash_map<std::wstring, std::vector<std::wstring> >::iterator iter = m_Keys.find(strSection); std::wstring strTmp(strSection);
std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
stdext::hash_map<std::wstring, std::vector<std::wstring> >::iterator iter = m_Keys.find(strTmp);
if (iter != m_Keys.end()) if (iter != m_Keys.end())
{ {
return (*iter).second; return (*iter).second;

2
Library/MeterString.cpp
View File

@ -198,7 +198,7 @@ void CMeterString::ReadConfig(const WCHAR* section)
m_AutoScale = 0!=parser.ReadInt(section, L"AutoScale", 0); m_AutoScale = 0!=parser.ReadInt(section, L"AutoScale", 0);
m_ClipString = 0!=parser.ReadInt(section, L"ClipString", 0); m_ClipString = 0!=parser.ReadInt(section, L"ClipString", 0);
m_FontSize = parser.ReadInt(section, L"FontSize", 10); m_FontSize = parser.ReadFormula(section, L"FontSize", 10);
m_NumOfDecimals = parser.ReadInt(section, L"NumOfDecimals", -1); m_NumOfDecimals = parser.ReadInt(section, L"NumOfDecimals", -1);
m_Angle = (Gdiplus::REAL)parser.ReadFloat(section, L"Angle", 0.0); m_Angle = (Gdiplus::REAL)parser.ReadFloat(section, L"Angle", 0.0);

2
revision-number.h
View File

@ -1,2 +1,2 @@
#pragma once #pragma once
const int revision_number = 191; const int revision_number = 192;