Additional changes to f2b52b4

This commit is contained in:
Birunthan Mohanathas 2012-07-18 09:22:47 +03:00
parent f2b52b4204
commit 4dbf7932ab
4 changed files with 38 additions and 118 deletions

View File

@ -299,8 +299,7 @@ void CMeterString::Initialize()
if (m_FontSize != 0) if (m_FontSize != 0)
{ {
std::wstring error = L"String: Unable to create font: " + m_FontFace; LogWithArgs(LOG_ERROR, L"String: Invalid font: %s", m_FontFace.c_str());
throw CError(error);
} }
} }
} }

View File

@ -236,7 +236,7 @@ CMeterWindow::~CMeterWindow()
** Initializes the window, creates the class and the window. ** Initializes the window, creates the class and the window.
** **
*/ */
int CMeterWindow::Initialize() void CMeterWindow::Initialize()
{ {
m_Window = CreateWindowEx( m_Window = CreateWindowEx(
WS_EX_TOOLWINDOW, WS_EX_TOOLWINDOW,
@ -252,11 +252,6 @@ int CMeterWindow::Initialize()
Rainmeter->GetInstance(), Rainmeter->GetInstance(),
this); this);
if (m_Window == NULL)
{
throw CError(L"Unable to register window");
}
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
// Mark the window to ignore the Aero peek // Mark the window to ignore the Aero peek
@ -277,10 +272,6 @@ int CMeterWindow::Initialize()
FadeWindow(0, m_AlphaValue); FadeWindow(0, m_AlphaValue);
} }
} }
Log(LOG_NOTICE, L"Initialization successful");
return 0;
} }
/* /*
@ -396,9 +387,6 @@ void CMeterWindow::Refresh(bool init, bool all)
return; return;
} }
InitializeMeasures();
InitializeMeters();
// Remove transparent flag // Remove transparent flag
RemoveWindowExStyle(WS_EX_TRANSPARENT); RemoveWindowExStyle(WS_EX_TRANSPARENT);
@ -2172,15 +2160,11 @@ bool CMeterWindow::ReadSkin()
m_HasNetMeasures = false; m_HasNetMeasures = false;
m_HasButtons = false; m_HasButtons = false;
// Measures must be created first to avoid errors in meters referencing measures. // Add measures to containers.
m_Measures.reserve(measures.size()); m_Measures.reserve(measures.size());
for (auto iter = measures.cbegin(); iter != measures.cend(); ++iter) for (auto iter = measures.cbegin(); iter != measures.cend(); ++iter)
{ {
CMeasure* measure = *iter; CMeasure* measure = *iter;
try
{
measure->ReadOptions(m_Parser);
m_Measures.push_back(measure); m_Measures.push_back(measure);
m_Parser.AddMeasure(measure); m_Parser.AddMeasure(measure);
@ -2189,36 +2173,36 @@ bool CMeterWindow::ReadSkin()
m_HasNetMeasures = true; m_HasNetMeasures = true;
} }
} }
catch (CError& error)
// Initialize measures. This is a separate loop to avoid errors caused by
// referencing not-yet-existent [measures] referencing in the options.
for (auto iter = measures.cbegin(); iter != measures.cend(); ++iter)
{ {
delete measure; CMeasure* measure = *iter;
measure = NULL; measure->ReadOptions(m_Parser);
LogError(error); measure->Initialize();
}
} }
// Initialize meters.
m_Meters.reserve(meters.size()); m_Meters.reserve(meters.size());
for (auto iter = meters.cbegin(); iter != meters.cend(); ++iter) for (auto iter = meters.cbegin(); iter != meters.cend(); ++iter)
{ {
CMeter* meter = *iter; CMeter* meter = *iter;
try
{
meter->ReadOptions(m_Parser);
m_Meters.push_back(meter); m_Meters.push_back(meter);
meter->ReadOptions(m_Parser);
meter->Initialize();
if (!meter->GetToolTipText().empty())
{
meter->CreateToolTip(this);
}
if (!m_HasButtons && meter->GetTypeID() == TypeID<CMeterButton>()) if (!m_HasButtons && meter->GetTypeID() == TypeID<CMeterButton>())
{ {
m_HasButtons = true; m_HasButtons = true;
} }
} }
catch (CError& error)
{
delete meter;
meter = NULL;
LogError(error);
}
}
if (m_Meters.empty()) if (m_Meters.empty())
{ {
@ -2230,53 +2214,6 @@ bool CMeterWindow::ReadSkin()
return true; return true;
} }
/*
** Initializes all the measures
**
*/
void CMeterWindow::InitializeMeasures()
{
// Initalize all measures
std::vector<CMeasure*>::const_iterator i = m_Measures.begin();
for ( ; i != m_Measures.end(); ++i)
{
try
{
(*i)->Initialize();
}
catch (CError& error)
{
LogError(error);
}
}
}
/*
** Initializes all the meters
**
*/
void CMeterWindow::InitializeMeters()
{
// Initalize all meters
std::vector<CMeter*>::const_iterator j = m_Meters.begin();
for ( ; j != m_Meters.end(); ++j)
{
try
{
(*j)->Initialize();
}
catch (CError& error)
{
LogError(error);
}
if (!(*j)->GetToolTipText().empty())
{
(*j)->CreateToolTip(this);
}
}
}
/* /*
** Changes the size of the window and re-adjusts the background ** Changes the size of the window and re-adjusts the background
*/ */

View File

@ -156,7 +156,7 @@ public:
CMeterWindow(const std::wstring& folderPath, const std::wstring& file); CMeterWindow(const std::wstring& folderPath, const std::wstring& file);
~CMeterWindow(); ~CMeterWindow();
int Initialize(); void Initialize();
void RunBang(BANGCOMMAND bang, const std::vector<std::wstring>& args); void RunBang(BANGCOMMAND bang, const std::vector<std::wstring>& args);
@ -311,8 +311,6 @@ private:
void ReadOptions(); void ReadOptions();
void WriteOptions(INT setting = OPTION_ALL); void WriteOptions(INT setting = OPTION_ALL);
bool ReadSkin(); bool ReadSkin();
void InitializeMeasures();
void InitializeMeters();
void ShowWindowIfAppropriate(); void ShowWindowIfAppropriate();
HWND GetWindowFromPoint(POINT pos); HWND GetWindowFromPoint(POINT pos);
void HandleButtons(POINT pos, BUTTONPROC proc, bool execute = true); void HandleButtons(POINT pos, BUTTONPROC proc, bool execute = true);

View File

@ -83,8 +83,6 @@ int RainmeterMain(LPWSTR cmdLine)
int ret = 1; int ret = 1;
Rainmeter = new CRainmeter; Rainmeter = new CRainmeter;
if (Rainmeter)
{
ret = Rainmeter->Initialize(cmdLine); ret = Rainmeter->Initialize(cmdLine);
if (ret == 0) if (ret == 0)
{ {
@ -93,7 +91,6 @@ int RainmeterMain(LPWSTR cmdLine)
delete Rainmeter; delete Rainmeter;
Rainmeter = NULL; Rainmeter = NULL;
}
return ret; return ret;
} }
@ -1406,25 +1403,14 @@ void CRainmeter::CreateMeterWindow(const std::wstring& folderPath, const std::ws
{ {
CMeterWindow* mw = new CMeterWindow(folderPath, file); CMeterWindow* mw = new CMeterWindow(folderPath, file);
if (mw)
{
// Note: May modify existing key // Note: May modify existing key
m_MeterWindows[folderPath] = mw; m_MeterWindows[folderPath] = mw;
try
{
mw->Initialize(); mw->Initialize();
CDialogAbout::UpdateSkins(); CDialogAbout::UpdateSkins();
CDialogManage::UpdateSkins(mw); CDialogManage::UpdateSkins(mw);
} }
catch (CError& error)
{
DeactivateSkin(mw, -1);
LogError(error);
}
}
}
void CRainmeter::DeleteMeterWindow(CMeterWindow* meterWindow, bool force) void CRainmeter::DeleteMeterWindow(CMeterWindow* meterWindow, bool force)
{ {