Browse files

Cosmetics

  • Loading branch information...
1 parent 6efb485 commit e3d92d354ca0f250ad428ac40ec7f6b150b448a6 @poiru poiru committed May 30, 2012
Showing with 106 additions and 106 deletions.
  1. +1 −1 Library/Measure.cpp
  2. +2 −2 Library/Measure.h
  3. +2 −2 Library/MeasureCPU.cpp
  4. +1 −1 Library/MeasureCPU.h
  5. +2 −2 Library/MeasureCalc.cpp
  6. +1 −1 Library/MeasureCalc.h
  7. +2 −2 Library/MeasureDiskSpace.cpp
  8. +1 −1 Library/MeasureDiskSpace.h
  9. +2 −2 Library/MeasureMemory.cpp
  10. +1 −1 Library/MeasureMemory.h
  11. +1 −1 Library/MeasureNet.cpp
  12. +1 −1 Library/MeasureNet.h
  13. +3 −3 Library/MeasureNetIn.cpp
  14. +1 −1 Library/MeasureNetIn.h
  15. +3 −3 Library/MeasureNetOut.cpp
  16. +1 −1 Library/MeasureNetOut.h
  17. +3 −3 Library/MeasureNetTotal.cpp
  18. +1 −1 Library/MeasureNetTotal.h
  19. +2 −2 Library/MeasurePhysicalMemory.cpp
  20. +1 −1 Library/MeasurePhysicalMemory.h
  21. +2 −2 Library/MeasurePlugin.cpp
  22. +1 −1 Library/MeasurePlugin.h
  23. +2 −2 Library/MeasureRegistry.cpp
  24. +1 −1 Library/MeasureRegistry.h
  25. +2 −2 Library/MeasureScript.cpp
  26. +1 −1 Library/MeasureScript.h
  27. +2 −2 Library/MeasureTime.cpp
  28. +1 −1 Library/MeasureTime.h
  29. +2 −2 Library/MeasureUptime.cpp
  30. +1 −1 Library/MeasureUptime.h
  31. +2 −2 Library/MeasureVirtualMemory.cpp
  32. +1 −1 Library/MeasureVirtualMemory.h
  33. +1 −1 Library/Meter.cpp
  34. +2 −2 Library/Meter.h
  35. +3 −3 Library/MeterBar.cpp
  36. +1 −1 Library/MeterBar.h
  37. +3 −3 Library/MeterBitmap.cpp
  38. +1 −1 Library/MeterBitmap.h
  39. +3 −3 Library/MeterButton.cpp
  40. +1 −1 Library/MeterButton.h
  41. +5 −5 Library/MeterHistogram.cpp
  42. +1 −1 Library/MeterHistogram.h
  43. +3 −3 Library/MeterImage.cpp
  44. +1 −1 Library/MeterImage.h
  45. +2 −2 Library/MeterLine.cpp
  46. +1 −1 Library/MeterLine.h
  47. +3 −3 Library/MeterRotator.cpp
  48. +1 −1 Library/MeterRotator.h
  49. +2 −2 Library/MeterRoundLine.cpp
  50. +1 −1 Library/MeterRoundLine.h
  51. +2 −2 Library/MeterString.cpp
  52. +1 −1 Library/MeterString.h
  53. +11 −11 Library/MeterWindow.cpp
  54. +1 −1 Library/MeterWindow.h
  55. +1 −1 Library/Rainmeter.cpp
  56. +1 −1 Library/TintedImage.cpp
  57. +1 −1 Library/TintedImage.h
  58. +2 −2 Library/TrayWindow.cpp
  59. +1 −1 Library/TrayWindow.h
View
2 Library/Measure.cpp
@@ -115,7 +115,7 @@ void CMeasure::Initialize()
** must call the base implementation if they overwrite this method.
**
*/
-void CMeasure::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasure::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Clear substitutes to prevent from being added more than once.
if (!m_Substitute.empty())
View
4 Library/Measure.h
@@ -49,7 +49,7 @@ class CMeasure : public CGroup
virtual UINT GetTypeID() = 0;
- void ReadConfig(CConfigParser& parser) { ReadConfig(parser, GetName()); }
+ void ReadOptions(CConfigParser& parser) { ReadOptions(parser, GetName()); }
virtual void Initialize();
bool Update();
@@ -85,7 +85,7 @@ class CMeasure : public CGroup
static CMeasure* Create(const WCHAR* measure, CMeterWindow* meterWindow, const WCHAR* name);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue() = 0;
bool ParseSubstitute(std::wstring buffer);
View
4 Library/MeasureCPU.cpp
@@ -94,9 +94,9 @@ CMeasureCPU::~CMeasureCPU()
** Reads the measure specific configs.
**
*/
-void CMeasureCPU::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureCPU::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
int processor = parser.ReadInt(section, L"Processor", 0);
View
2 Library/MeasureCPU.h
@@ -32,7 +32,7 @@ class CMeasureCPU : public CMeasure
virtual UINT GetTypeID() { return TypeID<CMeasureCPU>(); }
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureCalc.cpp
@@ -75,9 +75,9 @@ void CMeasureCalc::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasureCalc::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureCalc::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
// Store the current values so we know if the value needs to be updated
int oldLowBound = m_LowBound;
View
2 Library/MeasureCalc.h
@@ -32,7 +32,7 @@ class CMeasureCalc : public CMeasure
bool GetMeasureValue(const WCHAR* str, int len, double* value);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureDiskSpace.cpp
@@ -179,11 +179,11 @@ const WCHAR* CMeasureDiskSpace::GetStringValue(AUTOSCALE autoScale, double scale
** Reads the measure specific configs.
**
*/
-void CMeasureDiskSpace::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureDiskSpace::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
double oldMaxValue = m_MaxValue;
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
m_Drive = parser.ReadString(section, L"Drive", L"C:\\");
if (m_Drive.empty())
View
2 Library/MeasureDiskSpace.h
@@ -32,7 +32,7 @@ class CMeasureDiskSpace : public CMeasure
virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureMemory.cpp
@@ -60,9 +60,9 @@ void CMeasureMemory::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasureMemory::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureMemory::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
m_Total = (1 == parser.ReadInt(section, L"Total", 0));
View
2 Library/MeasureMemory.h
@@ -30,7 +30,7 @@ class CMeasureMemory : public CMeasure
virtual UINT GetTypeID() { return TypeID<CMeasureMemory>(); }
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
2 Library/MeasureNet.cpp
@@ -438,7 +438,7 @@ ULONG64 CMeasureNet::GetNetStatsValue(NET net)
** the net-parameter informs which inherited class called this method.
**
*/
-void CMeasureNet::ReadConfig(CConfigParser& parser, const WCHAR* section, NET net)
+void CMeasureNet::ReadOptions(CConfigParser& parser, const WCHAR* section, NET net)
{
double value;
const WCHAR* netName = NULL;
View
2 Library/MeasureNet.h
@@ -53,7 +53,7 @@ class CMeasureNet : public CMeasure
static void FinalizeNewApi();
protected:
- void ReadConfig(CConfigParser& parser, const WCHAR* section, CMeasureNet::NET net);
+ void ReadOptions(CConfigParser& parser, const WCHAR* section, CMeasureNet::NET net);
void UpdateValue();
ULONG64 GetNetOctets(NET net);
View
6 Library/MeasureNetIn.cpp
@@ -82,9 +82,9 @@ void CMeasureNetIn::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasureNetIn::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureNetIn::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
- CMeasureNet::ReadConfig(parser, section, NET_IN);
+ CMeasure::ReadOptions(parser, section);
+ CMeasureNet::ReadOptions(parser, section, NET_IN);
}
View
2 Library/MeasureNetIn.h
@@ -28,7 +28,7 @@ class CMeasureNetIn : public CMeasureNet
virtual ~CMeasureNetIn();
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
6 Library/MeasureNetOut.cpp
@@ -82,8 +82,8 @@ void CMeasureNetOut::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasureNetOut::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureNetOut::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
- CMeasureNet::ReadConfig(parser, section, NET_OUT);
+ CMeasure::ReadOptions(parser, section);
+ CMeasureNet::ReadOptions(parser, section, NET_OUT);
}
View
2 Library/MeasureNetOut.h
@@ -28,7 +28,7 @@ class CMeasureNetOut : public CMeasureNet
virtual ~CMeasureNetOut();
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
6 Library/MeasureNetTotal.cpp
@@ -82,8 +82,8 @@ void CMeasureNetTotal::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasureNetTotal::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureNetTotal::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
- CMeasureNet::ReadConfig(parser, section, NET_TOTAL);
+ CMeasure::ReadOptions(parser, section);
+ CMeasureNet::ReadOptions(parser, section, NET_TOTAL);
}
View
2 Library/MeasureNetTotal.h
@@ -28,7 +28,7 @@ class CMeasureNetTotal : public CMeasureNet
virtual ~CMeasureNetTotal();
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasurePhysicalMemory.cpp
@@ -60,9 +60,9 @@ void CMeasurePhysicalMemory::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasurePhysicalMemory::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasurePhysicalMemory::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
m_Total = (1 == parser.ReadInt(section, L"Total", 0));
View
2 Library/MeasurePhysicalMemory.h
@@ -30,7 +30,7 @@ class CMeasurePhysicalMemory : public CMeasure
virtual UINT GetTypeID() { return TypeID<CMeasurePhysicalMemory>(); }
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasurePlugin.cpp
@@ -99,11 +99,11 @@ void CMeasurePlugin::UpdateValue()
** Reads the configs and loads & initializes the plugin
**
*/
-void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasurePlugin::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
static UINT id = 0;
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
if (m_Initialized)
{
View
2 Library/MeasurePlugin.h
@@ -48,7 +48,7 @@ class CMeasurePlugin : public CMeasure
virtual void Command(const std::wstring& command);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureRegistry.cpp
@@ -104,9 +104,9 @@ void CMeasureRegistry::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasureRegistry::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureRegistry::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
const WCHAR* keyname = parser.ReadString(section, L"RegHKey", L"HKEY_CURRENT_USER").c_str();
if (_wcsicmp(keyname, L"HKEY_CURRENT_USER") == 0)
View
2 Library/MeasureRegistry.h
@@ -32,7 +32,7 @@ class CMeasureRegistry : public CMeasure
virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureScript.cpp
@@ -110,10 +110,10 @@ const WCHAR* CMeasureScript::GetStringValue(AUTOSCALE autoScale, double scale, i
** Reads the measure specific configs.
**
*/
-void CMeasureScript::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureScript::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Read common configs
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
std::wstring file = parser.ReadString(section, L"ScriptFile", L"");
View
2 Library/MeasureScript.h
@@ -36,7 +36,7 @@ class CMeasureScript : public CMeasure
void DeleteLuaScript();
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureTime.cpp
@@ -210,9 +210,9 @@ const WCHAR* CMeasureTime::GetStringValue(AUTOSCALE autoScale, double scale, int
** Reads the measure specific configs.
**
*/
-void CMeasureTime::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureTime::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
m_Format = parser.ReadString(section, L"Format", L"");
View
2 Library/MeasureTime.h
@@ -32,7 +32,7 @@ class CMeasureTime : public CMeasure
virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureUptime.cpp
@@ -42,9 +42,9 @@ CMeasureUptime::~CMeasureUptime()
** Reads the measure specific configs.
**
*/
-void CMeasureUptime::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureUptime::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
m_Format = parser.ReadString(section, L"Format", L"%4!i!d %3!i!:%2!02i!");
View
2 Library/MeasureUptime.h
@@ -32,7 +32,7 @@ class CMeasureUptime : public CMeasure
virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
4 Library/MeasureVirtualMemory.cpp
@@ -60,9 +60,9 @@ void CMeasureVirtualMemory::UpdateValue()
** Reads the measure specific configs.
**
*/
-void CMeasureVirtualMemory::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureVirtualMemory::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
- CMeasure::ReadConfig(parser, section);
+ CMeasure::ReadOptions(parser, section);
m_Total = (1 == parser.ReadInt(section, L"Total", 0));
View
2 Library/MeasureVirtualMemory.h
@@ -30,7 +30,7 @@ class CMeasureVirtualMemory : public CMeasure
virtual UINT GetTypeID() { return TypeID<CMeasureVirtualMemory>(); }
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
virtual void UpdateValue();
private:
View
2 Library/Meter.cpp
@@ -253,7 +253,7 @@ void CMeter::Hide()
** the base implementation if they overwrite this method.
**
*/
-void CMeter::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeter::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// The MeterStyle defines a template where the values are read if the meter doesn't have it itself
const std::wstring& style = parser.ReadString(section, L"MeterStyle", L"");
View
4 Library/Meter.h
@@ -38,7 +38,7 @@ class CMeter : public CGroup
virtual UINT GetTypeID() = 0;
- void ReadConfig(CConfigParser& parser) { ReadConfig(parser, GetName()); parser.ClearStyleTemplate(); }
+ void ReadOptions(CConfigParser& parser) { ReadOptions(parser, GetName()); parser.ClearStyleTemplate(); }
virtual void Initialize();
virtual bool Update();
@@ -127,7 +127,7 @@ class CMeter : public CGroup
POSITION_RELATIVE_BR
};
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
void SetAllMeasures(CMeasure* measure);
void SetAllMeasures(const std::vector<CMeasure*>& measures);
View
6 Library/MeterBar.cpp
@@ -82,15 +82,15 @@ void CMeterBar::Initialize()
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterBar::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterBar::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Store the current values so we know if the image needs to be updated
std::wstring oldImageName = m_ImageName;
int oldW = m_W;
int oldH = m_H;
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
m_Color = parser.ReadColor(section, L"BarColor", Color::Green);
@@ -100,7 +100,7 @@ void CMeterBar::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_MeterWindow->MakePathAbsolute(m_ImageName);
// Read tinting configs
- m_Image.ReadConfig(parser, section);
+ m_Image.ReadOptions(parser, section);
}
else
{
View
2 Library/MeterBar.h
@@ -35,7 +35,7 @@ class CMeterBar : public CMeter
virtual bool Draw(Gdiplus::Graphics& graphics);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
enum ORIENTATION
View
6 Library/MeterBitmap.cpp
@@ -154,23 +154,23 @@ bool CMeterBitmap::HitTest(int x, int y)
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterBitmap::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterBitmap::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Store the current values so we know if the image needs to be updated
std::wstring oldImageName = m_ImageName;
int oldW = m_W;
int oldH = m_H;
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
m_ImageName = parser.ReadString(section, L"BitmapImage", L"");
if (!m_ImageName.empty())
{
m_MeterWindow->MakePathAbsolute(m_ImageName);
// Read tinting configs
- m_Image.ReadConfig(parser, section);
+ m_Image.ReadOptions(parser, section);
}
else
{
View
2 Library/MeterBitmap.h
@@ -38,7 +38,7 @@ class CMeterBitmap : public CMeter
virtual bool HasActiveTransition();
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
CTintedImage m_Image;
View
6 Library/MeterButton.cpp
@@ -126,23 +126,23 @@ void CMeterButton::Initialize()
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterButton::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterButton::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Store the current values so we know if the image needs to be updated
std::wstring oldImageName = m_ImageName;
int oldW = m_W;
int oldH = m_H;
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
m_ImageName = parser.ReadString(section, L"ButtonImage", L"");
if (!m_ImageName.empty())
{
m_MeterWindow->MakePathAbsolute(m_ImageName);
// Read tinting configs
- m_Image.ReadConfig(parser, section);
+ m_Image.ReadOptions(parser, section);
}
else
{
View
2 Library/MeterButton.h
@@ -44,7 +44,7 @@ class CMeterButton : public CMeter
void SetFocus(bool f) { m_Focus = f; }
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
bool HitTest2(int px, int py, bool checkAlpha);
View
10 Library/MeterHistogram.cpp
@@ -182,7 +182,7 @@ void CMeterHistogram::Initialize()
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterHistogram::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Store the current values so we know if the image needs to be updated
std::wstring oldPrimaryImageName = m_PrimaryImageName;
@@ -192,7 +192,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section)
int oldH = m_H;
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
m_PrimaryColor = parser.ReadColor(section, L"PrimaryColor", Color::Green);
m_SecondaryColor = parser.ReadColor(section, L"SecondaryColor", Color::Red);
@@ -213,7 +213,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_MeterWindow->MakePathAbsolute(m_PrimaryImageName);
// Read tinting configs
- m_PrimaryImage.ReadConfig(parser, section);
+ m_PrimaryImage.ReadOptions(parser, section);
}
else
{
@@ -226,7 +226,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_MeterWindow->MakePathAbsolute(m_SecondaryImageName);
// Read tinting configs
- m_SecondaryImage.ReadConfig(parser, section);
+ m_SecondaryImage.ReadOptions(parser, section);
}
else
{
@@ -239,7 +239,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_MeterWindow->MakePathAbsolute(m_OverlapImageName);
// Read tinting configs
- m_OverlapImage.ReadConfig(parser, section);
+ m_OverlapImage.ReadOptions(parser, section);
}
else
{
View
2 Library/MeterHistogram.h
@@ -36,7 +36,7 @@ class CMeterHistogram : public CMeter
virtual void BindMeasure(const std::list<CMeasure*>& measures);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
void DisposeBuffer();
View
6 Library/MeterImage.cpp
@@ -106,10 +106,10 @@ void CMeterImage::LoadImage(const std::wstring& imageName, bool bLoadAlways)
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterImage::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterImage::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
// Check for extra measures
if (!m_Initialized && !m_MeasureName.empty())
@@ -135,7 +135,7 @@ void CMeterImage::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_ScaleMargins = parser.ReadRECT(section, L"ScaleMargins", defMargins);
// Read tinting configs
- m_Image.ReadConfig(parser, section);
+ m_Image.ReadOptions(parser, section);
if (m_Initialized &&
!m_Measure && !m_DynamicVariables)
View
2 Library/MeterImage.h
@@ -36,7 +36,7 @@ class CMeterImage : public CMeter
virtual void BindMeasure(const std::list<CMeasure*>& measures);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
void LoadImage(const std::wstring& imageName, bool bLoadAlways);
View
4 Library/MeterLine.cpp
@@ -99,7 +99,7 @@ void CMeterLine::Initialize()
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterLine::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterLine::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
WCHAR tmpName[64];
@@ -108,7 +108,7 @@ void CMeterLine::ReadConfig(CConfigParser& parser, const WCHAR* section)
int oldW = m_W;
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
int lineCount = parser.ReadInt(section, L"LineCount", 1);
View
2 Library/MeterLine.h
@@ -35,7 +35,7 @@ class CMeterLine : public CMeter
virtual void BindMeasure(const std::list<CMeasure*>& measures);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
std::vector<std::wstring> m_MeasureNames;
View
6 Library/MeterRotator.cpp
@@ -76,21 +76,21 @@ void CMeterRotator::Initialize()
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterRotator::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterRotator::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Store the current values so we know if the image needs to be updated
std::wstring oldImageName = m_ImageName;
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
m_ImageName = parser.ReadString(section, L"ImageName", L"");
if (!m_ImageName.empty())
{
m_MeterWindow->MakePathAbsolute(m_ImageName);
// Read tinting configs
- m_Image.ReadConfig(parser, section);
+ m_Image.ReadOptions(parser, section);
}
else
{
View
2 Library/MeterRotator.h
@@ -35,7 +35,7 @@ class CMeterRotator : public CMeter
virtual bool Draw(Gdiplus::Graphics& graphics);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
CTintedImage m_Image;
View
4 Library/MeterRoundLine.cpp
@@ -60,10 +60,10 @@ CMeterRoundLine::~CMeterRoundLine()
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterRoundLine::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterRoundLine::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
m_LineWidth = parser.ReadFloat(section, L"LineWidth", 1.0);
m_LineLength = parser.ReadFloat(section, L"LineLength", 20.0);
View
2 Library/MeterRoundLine.h
@@ -33,7 +33,7 @@ class CMeterRoundLine : public CMeter
virtual bool Draw(Gdiplus::Graphics& graphics);
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
bool m_Solid;
View
4 Library/MeterString.cpp
@@ -310,15 +310,15 @@ void CMeterString::Initialize()
** Read the meter-specific configs from the ini-file.
**
*/
-void CMeterString::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterString::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Store the current font values so we know if the font needs to be updated
std::wstring oldFontFace = m_FontFace;
int oldFontSize = m_FontSize;
TEXTSTYLE oldStyle = m_Style;
// Read common configs
- CMeter::ReadConfig(parser, section);
+ CMeter::ReadOptions(parser, section);
// Check for extra measures
if (!m_Initialized && !m_MeasureName.empty())
View
2 Library/MeterString.h
@@ -45,7 +45,7 @@ class CMeterString : public CMeter
static void EnumerateInstalledFontFamilies();
protected:
- virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
private:
enum TEXTSTYLE
View
22 Library/MeterWindow.cpp
@@ -394,7 +394,7 @@ void CMeterWindow::Refresh(bool init, bool all)
ZPOSITION oldZPos = m_WindowZPosition;
//TODO: Should these be moved to a Reload command instead of hitting the disk on every refresh
- ReadConfig(); // Read the general settings
+ ReadOptions(); // Read the general settings
if (!ReadSkin())
{
Rainmeter->DeactivateConfig(this, -1);
@@ -1361,7 +1361,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op
{
if ((*j)->BelongsToGroup(section))
{
- // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig())
+ // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions())
(*j)->SetDynamicVariables(true);
if (value.empty())
@@ -1379,7 +1379,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op
{
if ((*i)->BelongsToGroup(section))
{
- // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig())
+ // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions())
(*i)->SetDynamicVariables(true);
if (value.empty())
@@ -1398,7 +1398,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op
CMeter* meter = GetMeter(section);
if (meter)
{
- // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig())
+ // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions())
meter->SetDynamicVariables(true);
if (value.empty())
@@ -1416,7 +1416,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op
CMeasure* measure = GetMeasure(section);
if (measure)
{
- // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig())
+ // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions())
measure->SetDynamicVariables(true);
if (value.empty())
@@ -1776,7 +1776,7 @@ void CMeterWindow::ScreenToWindow()
** Reads the current config
**
*/
-void CMeterWindow::ReadConfig()
+void CMeterWindow::ReadOptions()
{
WCHAR buffer[32];
const std::wstring& iniFile = Rainmeter->GetIniFile();
@@ -2170,7 +2170,7 @@ bool CMeterWindow::ReadSkin()
measure = CMeasure::Create(measureName.c_str(), this, section);
if (measure)
{
- measure->ReadConfig(m_Parser);
+ measure->ReadOptions(m_Parser);
m_Measures.push_back(measure);
m_Parser.AddMeasure(measure);
@@ -2202,7 +2202,7 @@ bool CMeterWindow::ReadSkin()
meter = CMeter::Create(meterName.c_str(), this, section);
if (meter)
{
- meter->ReadConfig(m_Parser);
+ meter->ReadOptions(m_Parser);
m_Meters.push_back(meter);
@@ -2338,7 +2338,7 @@ bool CMeterWindow::ResizeWindow(bool reset)
{
// Load the background
CTintedImage* tintedBackground = new CTintedImage(L"Background");
- tintedBackground->ReadConfig(m_Parser, L"Rainmeter");
+ tintedBackground->ReadOptions(m_Parser, L"Rainmeter");
tintedBackground->LoadImage(m_BackgroundName, true);
if (!tintedBackground->IsLoaded())
@@ -2652,7 +2652,7 @@ bool CMeterWindow::UpdateMeasure(CMeasure* measure, bool force)
{
try
{
- measure->ReadConfig(m_Parser);
+ measure->ReadOptions(m_Parser);
}
catch (CError& error)
{
@@ -2690,7 +2690,7 @@ bool CMeterWindow::UpdateMeter(CMeter* meter, bool& bActiveTransition, bool forc
{
try
{
- meter->ReadConfig(m_Parser);
+ meter->ReadOptions(m_Parser);
}
catch (CError& error)
{
View
2 Library/MeterWindow.h
@@ -322,7 +322,7 @@ class CMeterWindow : public CGroup
bool UpdateMeter(CMeter* meter, bool& bActiveTransition, bool force);
void Update(bool refresh);
void UpdateWindow(int alpha, bool reset);
- void ReadConfig();
+ void ReadOptions();
void WriteConfig(INT setting = SETTING_ALL);
bool ReadSkin();
void InitializeMeasures();
View
2 Library/Rainmeter.cpp
@@ -2174,7 +2174,7 @@ void CRainmeter::ReadGeneralSettings(const std::wstring& iniFile)
if (m_TrayWindow)
{
- m_TrayWindow->ReadConfig(parser);
+ m_TrayWindow->ReadOptions(parser);
}
m_GlobalConfig.netInSpeed = parser.ReadFloat(L"Rainmeter", L"NetInSpeed", 0.0);
View
2 Library/TintedImage.cpp
@@ -566,7 +566,7 @@ void CTintedImage::ApplyTransform()
** Read the meter-specific configs from the ini-file.
**
*/
-void CTintedImage::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CTintedImage::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
// Store the current values so we know if the image needs to be tinted or transformed
Rect oldCrop = m_Crop;
View
2 Library/TintedImage.h
@@ -68,7 +68,7 @@ class CTintedImage
CTintedImage(const WCHAR* name = L"Image", const WCHAR** configArray = c_DefaultOptionArray, bool disableTransform = false);
~CTintedImage();
- void ReadConfig(CConfigParser& parser, const WCHAR* section);
+ void ReadOptions(CConfigParser& parser, const WCHAR* section);
bool IsLoaded() { return (m_Bitmap != NULL); }
bool IsTinted() { return (m_BitmapTint != NULL); }
View
4 Library/TrayWindow.cpp
@@ -301,7 +301,7 @@ void CTrayWindow::ShowUpdateNotification(const WCHAR* newVersion)
ShowNotification(TRAY_NOTIFICATION_UPDATE, GetString(ID_STR_UPDATEAVAILABLE), text.c_str());
}
-void CTrayWindow::ReadConfig(CConfigParser& parser)
+void CTrayWindow::ReadOptions(CConfigParser& parser)
{
// Clear old Settings
KillTimer(m_Window, TIMER_TRAY);
@@ -337,7 +337,7 @@ void CTrayWindow::ReadConfig(CConfigParser& parser)
m_Measure = CMeasure::Create(measureName.c_str(), NULL, L"TrayMeasure");
if (m_Measure)
{
- m_Measure->ReadConfig(parser);
+ m_Measure->ReadOptions(parser);
}
}
catch (CError& error)
View
2 Library/TrayWindow.h
@@ -44,7 +44,7 @@ class CTrayWindow
void Initialize();
- void ReadConfig(CConfigParser& parser);
+ void ReadOptions(CConfigParser& parser);
HWND GetWindow() { return m_Window; }
bool IsTrayIconEnabled() { return m_IconEnabled; }

0 comments on commit e3d92d3

Please sign in to comment.