mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Groups can now be defined under the skins [Rainmeter] section as well (in addition to Rainmeter.ini).
Also fixed small typo in r622.
This commit is contained in:
parent
1f3a04e54e
commit
b63f92f127
@ -1541,8 +1541,6 @@ void CMeterWindow::ReadConfig()
|
||||
m_AlphaValue = 255;
|
||||
m_FadeDuration = 250;
|
||||
|
||||
std::wstring group = L"";
|
||||
|
||||
CConfigParser parser;
|
||||
parser.Initialize(iniFile.c_str(), m_Rainmeter);
|
||||
|
||||
@ -1622,8 +1620,7 @@ void CMeterWindow::ReadConfig()
|
||||
|
||||
m_FadeDuration = parser.ReadInt(section, L"FadeDuration", m_FadeDuration);
|
||||
|
||||
group = parser.ReadString(section, L"Group", group.c_str());
|
||||
InitializeGroup(group);
|
||||
m_ConfigGroup = parser.ReadString(section, L"Group", m_ConfigGroup.c_str());
|
||||
|
||||
// On the second loop override settings from the skin's section
|
||||
section = m_SkinName.c_str();
|
||||
@ -1717,6 +1714,9 @@ bool CMeterWindow::ReadSkin()
|
||||
m_Parser.Initialize(iniFile.c_str(), m_Rainmeter, this);
|
||||
|
||||
// Global settings
|
||||
m_ConfigGroup += L"|";
|
||||
m_ConfigGroup += m_Parser.ReadString(L"Rainmeter", L"Group", m_ConfigGroup.c_str());
|
||||
InitializeGroup(m_ConfigGroup);
|
||||
|
||||
// Check the version
|
||||
int appVersion = m_Parser.ReadInt(L"Rainmeter", L"AppVersion", 0);
|
||||
|
@ -294,6 +294,7 @@ private:
|
||||
bool m_MouseOver;
|
||||
|
||||
std::wstring m_Author; // Skin's author
|
||||
std::wstring m_ConfigGroup;
|
||||
std::wstring m_BackgroundName; // Name of the background image
|
||||
Gdiplus::Rect m_BackgroundMargins;
|
||||
Gdiplus::Rect m_DragMargins;
|
||||
|
@ -3766,7 +3766,7 @@ void CRainmeter::SetDebug(bool debug)
|
||||
void CRainmeter::SetDisableDrag(bool drag)
|
||||
{
|
||||
m_DisableDrag = drag;
|
||||
WritePrivateProfileString(L"Rainmeter", L"DisableDrag", dragging ? L"1" : L"0", m_IniFile.c_str());
|
||||
WritePrivateProfileString(L"Rainmeter", L"DisableDrag", drag ? L"1" : L"0", m_IniFile.c_str());
|
||||
}
|
||||
|
||||
void CRainmeter::TestSettingsFile(bool bDefaultIniLocation)
|
||||
|
Loading…
Reference in New Issue
Block a user