mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Cosmetic changes here and there.
This commit is contained in:
@ -924,7 +924,7 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
|
||||
{
|
||||
if (depth > 100) // Is 100 enough to assume the include loop never ends?
|
||||
{
|
||||
MessageBox(NULL, L"It looks like you've made an infinite\nloop with the @include statements.\nPlease check your skin.", L"Rainmeter", MB_OK | MB_ICONERROR);
|
||||
MessageBox(NULL, L"It looks like you've made an infinite\nloop with the @include statements.\nPlease check your skin.", L"Rainmeter", MB_OK | MB_TOPMOST | MB_ICONERROR);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -692,5 +692,5 @@ CMeasure* CMeasure::Create(const WCHAR* measure, CMeterWindow* meterWindow)
|
||||
*/
|
||||
void CMeasure::ExecuteBang(const WCHAR* args)
|
||||
{
|
||||
DebugLog(L"[%s] Doesn't support this bang: %s", m_Name.c_str(), args);
|
||||
DebugLog(L"[%s] doesn't support this bang: %s", m_Name.c_str(), args);
|
||||
}
|
||||
|
@ -230,6 +230,6 @@ void CMeasurePlugin::ExecuteBang(const WCHAR* args)
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLog(L"[%s] Doesn't support bangs.", m_Name.c_str());
|
||||
DebugLog(L"[%s] doesn't support bangs.", m_Name.c_str());
|
||||
}
|
||||
}
|
@ -308,9 +308,9 @@ void CMeterWindow::Refresh(bool init, bool all)
|
||||
|
||||
m_Rainmeter->SetCurrentParser(&m_Parser);
|
||||
|
||||
std::wstring dbg = L"Refreshing (Name: \"" + m_SkinName;
|
||||
dbg += L"\" Ini: \"" + m_SkinIniFile;
|
||||
dbg += L"\")";
|
||||
std::wstring dbg = L"Refreshing skin \"" + m_SkinName;
|
||||
dbg += L"\\" + m_SkinIniFile;
|
||||
dbg += L"\"";
|
||||
LSLog(LOG_DEBUG, L"Rainmeter", dbg.c_str());
|
||||
|
||||
m_Refreshing = true;
|
||||
@ -765,7 +765,7 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const WCHAR* arg)
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLog(L"Cannot parse parameters for !RainmeterMove");
|
||||
DebugLog(L"Unable to parse parameters for !RainmeterMove");
|
||||
}
|
||||
break;
|
||||
|
||||
@ -861,7 +861,7 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const WCHAR* arg)
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLog(L"Cannot parse parameters for !RainmeterLsBoxHook (%s)", arg);
|
||||
DebugLog(L"Unable to parse parameters for !RainmeterLsBoxHook (%s)", arg);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -877,12 +877,12 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const WCHAR* arg)
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLog(L"Cannot parse the for !RainmeterMoveMeter");
|
||||
DebugLog(L"Unable to parse coordinates for !RainmeterMoveMeter");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLog(L"Cannot parse the coordinates for !RainmeterMoveMeter");
|
||||
DebugLog(L"Unable to parse parameters for !RainmeterMoveMeter");
|
||||
}
|
||||
break;
|
||||
|
||||
@ -924,7 +924,7 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const WCHAR* arg)
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLog(L"Cannot parse the !RainmeterPluginBang");
|
||||
DebugLog(L"Unable to parse parameters for !RainmeterPluginBang");
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -955,7 +955,7 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const WCHAR* arg)
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLog(L"Cannot parse parameters for !RainmeterSetVariable");
|
||||
DebugLog(L"Unable to parse parameters for !RainmeterSetVariable");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -1493,7 +1493,7 @@ int CRainmeter::Initialize(HWND Parent, HINSTANCE Instance, LPCSTR szPath)
|
||||
|
||||
if (c_Debug)
|
||||
{
|
||||
LSLog(LOG_DEBUG, APPNAME, L"Enumerating installed font families ...");
|
||||
LSLog(LOG_DEBUG, APPNAME, L"Enumerating installed font families...");
|
||||
CMeterString::EnumerateInstalledFontFamilies();
|
||||
}
|
||||
|
||||
@ -1506,7 +1506,7 @@ int CRainmeter::Initialize(HWND Parent, HINSTANCE Instance, LPCSTR szPath)
|
||||
if(m_ConfigStrings.empty())
|
||||
{
|
||||
std::wstring error = L"There are no available skins at:\n" + m_SkinPath;
|
||||
MessageBox(NULL, error.c_str(), APPNAME, MB_OK | MB_ICONERROR);
|
||||
MessageBox(NULL, error.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONERROR);
|
||||
}
|
||||
|
||||
ReadGeneralSettings(m_IniFile);
|
||||
@ -1708,13 +1708,13 @@ void CRainmeter::CheckSkinVersions()
|
||||
else
|
||||
{
|
||||
std::wstring strMessage = L"Failed to upgrade the config.\nUnable to backup the current config.";
|
||||
MessageBox(NULL, strMessage.c_str(), APPNAME, MB_OK | MB_ICONERROR);
|
||||
MessageBox(NULL, strMessage.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONERROR);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstring strMessage = L"Failed to upgrade the config.\nThe version number contains illegal characters.";
|
||||
MessageBox(NULL, strMessage.c_str(), APPNAME, MB_OK | MB_ICONERROR);
|
||||
MessageBox(NULL, strMessage.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1846,11 +1846,11 @@ void CRainmeter::ActivateConfig(int configIndex, int iniIndex)
|
||||
|
||||
if (_waccess(skinIniPath.c_str(), 0) == -1)
|
||||
{
|
||||
std::wstring message = L"Unable to activate config \"";
|
||||
std::wstring message = L"Unable to activate skin \"";
|
||||
message += skinConfig.c_str();
|
||||
message += L"\": Ini-file not found: \"";
|
||||
message += L"\\";
|
||||
message += skinIniFile.c_str();
|
||||
message += L"\"";
|
||||
message += L"\": Ini-file not found.";
|
||||
LSLog(LOG_DEBUG, APPNAME, message.c_str());
|
||||
MessageBox(NULL, message.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
|
||||
return;
|
||||
@ -2573,7 +2573,7 @@ BOOL CRainmeter::ExecuteBang(const std::wstring& bang, const std::wstring& arg,
|
||||
{
|
||||
std::wstring error = L"Unknown !bang: ";
|
||||
error += bang;
|
||||
MessageBox(NULL, error.c_str(), APPNAME, MB_OK);
|
||||
MessageBox(NULL, error.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -2868,8 +2868,8 @@ void CRainmeter::ReadGeneralSettings(std::wstring& iniFile)
|
||||
if (!SetActiveConfig(skinName, skinIni))
|
||||
{
|
||||
std::wstring error;
|
||||
error = L"The selected config (L" + skinName + L"\\" + skinIni + L") cannot be found.";
|
||||
MessageBox(NULL, error.c_str(), APPNAME, MB_OK);
|
||||
error = L"The selected skin (L" + skinName + L"\\" + skinIni + L") cannot be found.";
|
||||
MessageBox(NULL, error.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -3692,7 +3692,7 @@ void CRainmeter::StartLogging()
|
||||
|
||||
std::wstring message = L"Log file created at: ";
|
||||
message += m_LogFile;
|
||||
MessageBox(NULL, message.c_str(), APPNAME, MB_OK | MB_ICONINFORMATION);
|
||||
MessageBox(NULL, message.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONINFORMATION);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -3702,7 +3702,7 @@ void CRainmeter::StartLogging()
|
||||
|
||||
std::wstring message = L"Unable to create log file: ";
|
||||
message += m_LogFile;
|
||||
MessageBox(NULL, message.c_str(), APPNAME, MB_OK | MB_ICONERROR);
|
||||
MessageBox(NULL, message.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONERROR);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -3723,7 +3723,7 @@ void CRainmeter::DeleteLogFile()
|
||||
{
|
||||
std::wstring message = L"Do you want to delete the following log file?\n";
|
||||
message += m_LogFile;
|
||||
int res = MessageBox(NULL, message.c_str(), L"Rainmeter", MB_YESNO | MB_ICONQUESTION);
|
||||
int res = MessageBox(NULL, message.c_str(), L"Rainmeter", MB_YESNO | MB_TOPMOST | MB_ICONQUESTION);
|
||||
if (res == IDYES)
|
||||
{
|
||||
// Disable logging
|
||||
|
Reference in New Issue
Block a user