mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Added MeterStyle functionality:
Rainy, given the "issues" listed at the bottom of this comment, I leave it to you whether to create a build using this revision or use r208 for the build. I would like to start testing MeterStyle, but there are a few more things it needs work on. What is MeterStyle? MeterStyle This will allow users to create CSS-like "Styles" for meters. This means that all the parameters of a meter can be defined in the style, and then many meters can use the style to eliminate copy / pasting the same parameters over and over on multiple meters. (Examples: FontColor=, FontSize= etc.) How do I use it? You will create a new [Section] (as many as you want) in the .ini. The section(s) can have any name. [MyStringStyle] Then you will tell Rainmeter that this is a "MeterStyle" and not a measure or meter Style=Meter Note: The "value" of the key "Style" can be anything. It can be used to add a description of the style if you like. Style=This style is for the AccuWeather part of this skin It is however required, both to tell Rainmeter it is not a meter or measure and to have the MeterStyle routines parse it. Then you define parameters you want to use in the style FontColor=#FontColor# FontFace=TheSansBold-Caps FontSize=11 StringEffect=SHADOW StringStyle=BOLD StringAlign=LEFT AntiAlias=1 Then in any or all meters, you just use [MeterName] Meter=STRING (or any other meter type) MeterStyle=MyStringStyle None of the parameters in the style are then required to be actually in the meter(s). They are "inherited" from the MeterStyle. Note: This works and has had preliminary testing with dynamic variables like FontColor=[MeasureName] and regular variables like FontColor=#FontColor#. It doesn't matter if the [Variables] section or the [MeasureName] measure is before or after the [StyleName] in the .ini file. What if I want to override a MeterStyle parameter on a meter? Sure. Just put in any parameter with a value different from the one defined in the MeterStyle and the one in the meter will take presidence. All non-defined parameters will still use the MeterStyle value. [MeterName] Meter=STRING MeterStyle=MyStringStyle FontColor=100,100,100,50 What are these "known issues" you are on about? This is still a bit of a work in progress. Right now you cannot define X or Y in a style. You can define W and H, but NOT for a STRING meter. You cannot define a "Transformation Matrix" in a style. MattKing will be looking into these tomorrow. W and H in a string meter is our top priority. We will also look at X and Y and hope for an easy solution. Transformation Matrix may have to come later.
This commit is contained in:
@ -132,27 +132,14 @@ void CConfigParser::SetVariable(const std::wstring& strVariable, const std::wstr
|
||||
**
|
||||
**
|
||||
*/
|
||||
const std::wstring& CConfigParser::ReadString(LPCTSTR section, LPCTSTR key, LPCTSTR defValue, bool bReplaceMeasures)
|
||||
const std::wstring& CConfigParser::ReadString(LPCTSTR section, LPCTSTR key, LPCTSTR defValue, bool bReplaceMeasures, bool bReplaceDefValue)
|
||||
{
|
||||
static std::wstring result;
|
||||
|
||||
if (section == NULL)
|
||||
{
|
||||
section = L"";
|
||||
}
|
||||
if (key == NULL)
|
||||
{
|
||||
key = L"";
|
||||
}
|
||||
if (defValue == NULL)
|
||||
{
|
||||
defValue = L"";
|
||||
}
|
||||
|
||||
result = GetValue(section, key, defValue);
|
||||
if (result == defValue)
|
||||
if (result == defValue && bReplaceDefValue == false)
|
||||
{
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
// Check Litestep vars
|
||||
@ -458,7 +445,7 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
|
||||
items[0] = 0;
|
||||
int res = GetPrivateProfileString( NULL, NULL, NULL, items, size, iniFile.c_str());
|
||||
if (res == 0) return; // File not found
|
||||
if (res < size - 2) break; // Fits in the buffer
|
||||
if (res != size - 2) break; // Fits in the buffer
|
||||
|
||||
delete [] items;
|
||||
size *= 2;
|
||||
@ -487,7 +474,7 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
|
||||
{
|
||||
items[0] = 0;
|
||||
int res = GetPrivateProfileString((*iter).first.c_str(), NULL, NULL, items, size, iniFile.c_str());
|
||||
if (res < size - 2) break; // Fits in the buffer
|
||||
if (res != size - 2) break; // Fits in the buffer
|
||||
|
||||
delete [] items;
|
||||
size *= 2;
|
||||
@ -503,11 +490,11 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
|
||||
{
|
||||
buffer[0] = 0;
|
||||
int res = GetPrivateProfileString((*iter).first.c_str(), strKey.c_str(), L"", buffer, bufferSize, iniFile.c_str());
|
||||
if (res < bufferSize - 2) break; // Fits in the buffer
|
||||
if (res != size - 2) break; // Fits in the buffer
|
||||
|
||||
delete [] buffer;
|
||||
bufferSize *= 2;
|
||||
buffer = new WCHAR[bufferSize];
|
||||
buffer = new WCHAR[size];
|
||||
};
|
||||
|
||||
SetValue((*iter).first, strKey, buffer);
|
||||
@ -606,3 +593,4 @@ std::vector<std::wstring> CConfigParser::GetKeys(const std::wstring& strSection)
|
||||
return std::vector<std::wstring>();
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user