- Fixed a problem that !RainmeterQuit isn't executed when no meter window is running.

- Fixed a problem that StyleTemplate affects to Meters which have no relation.

- Added a workaround to avoid the "IniFileMapping" function when reading skins.

- Some small code cosmetics.
This commit is contained in:
spx
2010-04-02 01:35:53 +00:00
parent a6f2f01036
commit 415c905d0a
9 changed files with 157 additions and 44 deletions

View File

@ -41,6 +41,7 @@ public:
void AddMeasure(CMeasure* pMeasure);
void SetVariable(const std::wstring& strVariable, const std::wstring& strValue);
void SetStyleTemplate(const std::wstring& strStyle) { m_StyleTemplate = strStyle; }
void ResetStyleTemplate() { m_StyleTemplate.clear(); }
void ResetVariables(CRainmeter* pRainmeter, CMeterWindow* meterWindow = NULL);
@ -76,6 +77,9 @@ private:
void SetAutoSelectedMonitorVariables(CMeterWindow* meterWindow);
void GetIniFileMappingList();
std::wstring GetAlternateFileName(const std::wstring& iniFile);
static void SetMultiMonitorVariables(bool reset);
static void SetMonitorVariable(const std::wstring& strVariable, const std::wstring& strValue);
@ -91,6 +95,8 @@ private:
stdext::hash_map<std::wstring, std::vector<std::wstring> > m_Keys;
stdext::hash_map<std::wstring, std::wstring> m_Values;
std::vector<std::wstring> m_IniFileMappings;
static std::map<std::wstring, std::wstring> c_MonitorVariables;
};