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

Cosmetic changes.

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-02-01 18:00:32 +00:00
parent e15fff8946
commit b65b26c2b7
3 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Library/Export.cpp
View File

@ -132,7 +132,7 @@ LPCWSTR PluginBridge(LPCWSTR command, LPCWSTR data)
if (_wcsicmp(command, L"GetConfig") == 0) if (_wcsicmp(command, L"GetConfig") == 0)
{ {
CMeterWindow *meterWindow = Rainmeter->GetMeterWindowByINI(data); CMeterWindow* meterWindow = Rainmeter->GetMeterWindowByINI(data);
if (meterWindow) if (meterWindow)
{ {
g_Buffer = L"\""; g_Buffer = L"\"";
@ -151,7 +151,7 @@ LPCWSTR PluginBridge(LPCWSTR command, LPCWSTR data)
{ {
const std::wstring& config = subStrings[0]; const std::wstring& config = subStrings[0];
CMeterWindow *meterWindow = Rainmeter->GetMeterWindow(config); CMeterWindow* meterWindow = Rainmeter->GetMeterWindow(config);
if (meterWindow) if (meterWindow)
{ {
WCHAR buf1[64]; WCHAR buf1[64];
@ -171,7 +171,7 @@ LPCWSTR PluginBridge(LPCWSTR command, LPCWSTR data)
{ {
const std::wstring& config = subStrings[0]; const std::wstring& config = subStrings[0];
CMeterWindow *meterWindow = Rainmeter->GetMeterWindow(config); CMeterWindow* meterWindow = Rainmeter->GetMeterWindow(config);
if (meterWindow) if (meterWindow)
{ {
const std::wstring& variable = subStrings[1]; const std::wstring& variable = subStrings[1];
@ -187,20 +187,15 @@ LPCWSTR PluginBridge(LPCWSTR command, LPCWSTR data)
} }
else if (_wcsicmp(command, L"SetVariable") == 0) else if (_wcsicmp(command, L"SetVariable") == 0)
{ {
const WCHAR* pos = wcschr(data, L' '); std::vector<std::wstring> subStrings = CRainmeter::ParseString(data);
if (pos)
{
std::wstring config(data + 1, pos - 1);
std::vector<std::wstring> subStrings = CRainmeter::ParseString(pos);
if (subStrings.size() == 2) if (subStrings.size() == 3)
{
CMeterWindow* meterWindow = Rainmeter->GetMeterWindow(subStrings[0]);
if (meterWindow)
{ {
CMeterWindow *meterWindow = Rainmeter->GetMeterWindow(config); meterWindow->SetVariable(subStrings[1], subStrings[2]);
if (meterWindow) return L"success";
{
meterWindow->RunBang(BANG_SETVARIABLE, subStrings);
return L"success";
}
} }
} }

51
Library/MeterWindow.cpp
View File

@ -843,9 +843,7 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const std::vector<std::wstring>& ar
break; break;
case BANG_MOVE: case BANG_MOVE:
{ MoveWindow(_wtoi(args[0].c_str()), _wtoi(args[1].c_str()));
MoveWindow(_wtoi(args[0].c_str()), _wtoi(args[1].c_str()));
}
break; break;
case BANG_ZPOS: case BANG_ZPOS:
@ -950,27 +948,7 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const std::vector<std::wstring>& ar
break; break;
case BANG_SETVARIABLE: case BANG_SETVARIABLE:
{ SetVariable(args[0], args[1]);
const std::wstring& variable = args[0];
const std::wstring& value = args[1];
// Formula read fine
double result;
if (m_Parser.ParseFormula(value, &result))
{
WCHAR buffer[256];
int len = _snwprintf_s(buffer, _TRUNCATE, L"%.5f", result);
CMeasure::RemoveTrailingZero(buffer, len);
const std::wstring& resultString = buffer;
m_Parser.SetVariable(variable, resultString);
}
else
{
m_Parser.SetVariable(variable, value);
}
}
break; break;
case BANG_SETOPTION: case BANG_SETOPTION:
@ -1384,6 +1362,31 @@ void CMeterWindow::UpdateMeasure(const std::wstring& name, bool group)
if (!group) LogWithArgs(LOG_ERROR, L"!UpdateMeasure: [%s] not found in \"%s\"", measure, m_SkinName.c_str()); if (!group) LogWithArgs(LOG_ERROR, L"!UpdateMeasure: [%s] not found in \"%s\"", measure, m_SkinName.c_str());
} }
/*
** SetVariable
**
** Sets variable to given value.
**
*/
void CMeterWindow::SetVariable(const std::wstring& variable, const std::wstring& value)
{
double result;
if (m_Parser.ParseFormula(value, &result))
{
WCHAR buffer[256];
int len = _snwprintf_s(buffer, _TRUNCATE, L"%.5f", result);
CMeasure::RemoveTrailingZero(buffer, len);
const std::wstring& resultString = buffer;
m_Parser.SetVariable(variable, resultString);
}
else
{
m_Parser.SetVariable(variable, value);
}
}
/* /*
** SetOption ** SetOption
** **

1
Library/MeterWindow.h
View File

@ -181,6 +181,7 @@ public:
void UpdateMeasure(const std::wstring& name, bool group = false); void UpdateMeasure(const std::wstring& name, bool group = false);
void Refresh(bool init, bool all = false); void Refresh(bool init, bool all = false);
void Redraw(); void Redraw();
void SetVariable(const std::wstring& variable, const std::wstring& value);
void SetOption(const std::wstring& section, const std::wstring& option, const std::wstring& value, bool group); void SetOption(const std::wstring& section, const std::wstring& option, const std::wstring& value, bool group);
void SetMouseLeaveEvent(bool cancel); void SetMouseLeaveEvent(bool cancel);